(image-type-auto-detected-p): Doc fix. Don't detect an image if it is

not in image-type-auto-detectable, or is there with a nil value.

diff --git a/lisp/image.el b/lisp/image.el
index e6c5b2e2d2c63f95c2d92d7ff874fff4a8c5aded..77f8ffe02c2168d7980b018159997bd3b5bacb6c 100644 (file)
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -343,10 +343,12 @@ This function is intended to be used from `magic-fallback-mode-alist'.
 
 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)))))