[Emacs-diffs] /srv/bzr/emacs/trunk r110155: Fix last change.

[Chong Yidong]

------------------------------------------------------------
revno: 110155
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2012-09-23 17:22:38 +0800
message:
  Fix last change.
  
  * image.c (valid_image_p, make_image): Fix caller to lookup_image_type.
modified:
  src/ChangeLog
  src/image.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-23 09:16:57 +0000
+++ b/src/ChangeLog     2012-09-23 09:22:38 +0000
@@ -17,6 +17,7 @@
        (init_tiff_functions, init_gif_functions, init_svg_functions):
        Arglist and w32_delayed_load calling convention changed.
        (gs_type): Remove init_gs_functions; there is no such function.
+       (valid_image_p, make_image): Fix caller to lookup_image_type.
 
 2012-09-23  Paul Eggert  <address@hidden>
 

=== modified file 'src/image.c'
--- a/src/image.c       2012-09-23 09:16:57 +0000
+++ b/src/image.c       2012-09-23 09:22:38 +0000
@@ -562,7 +562,7 @@
 /* Function prototypes.  */
 
 static struct image_type *define_image_type (struct image_type *, Lisp_Object);
-static struct image_type *lookup_image_type (Lisp_Object, Lisp_Object);
+static struct image_type *lookup_image_type (Lisp_Object);
 static void image_error (const char *format, Lisp_Object, Lisp_Object);
 static void x_laplace (struct frame *, struct image *);
 static void x_emboss (struct frame *, struct image *);
@@ -648,7 +648,7 @@
            if (CONSP (tem) && SYMBOLP (XCAR (tem)))
              {
                struct image_type *type;
-               type = lookup_image_type (XCAR (tem), Qnil);
+               type = lookup_image_type (XCAR (tem));
                if (type)
                  valid_p = type->valid_p (object);
              }
@@ -981,7 +981,7 @@
 
   eassert (valid_image_p (spec));
   img->dependencies = NILP (file) ? Qnil : list1 (file);
-  img->type = lookup_image_type (image_spec_value (spec, QCtype, NULL), Qnil);
+  img->type = lookup_image_type (image_spec_value (spec, QCtype, NULL));
   eassert (img->type != NULL);
   img->spec = spec;
   img->lisp_data = Qnil;