[Emacs-diffs] Changes to emacs/lisp/image.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       07/09/27 06:38:30

Index: image.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/image.el,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- image.el    25 Aug 2007 14:05:49 -0000      1.76
+++ image.el    27 Sep 2007 06:38:29 -0000      1.77
@@ -343,10 +343,12 @@
 
 The buffer is considered to contain an auto-detectable image if
 its beginning matches an image type in `image-type-header-regexps',
-and that image type is present in `image-type-auto-detectable'."
+and that image type is present in `image-type-auto-detectable' with a
+non-nil value.  If that value is non-nil, but not t, then the image type
+must be available."
   (let* ((type (image-type-from-buffer))
         (auto (and type (cdr (assq type image-type-auto-detectable)))))
-    (and type
+    (and type auto
         (or (eq auto t) (image-type-available-p type)))))