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

[Chong Yidong]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Chong Yidong <cyd>      07/06/04 20:40:53

Index: image.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/image.el,v
retrieving revision 1.70
retrieving revision 1.70.2.1
diff -u -b -r1.70 -r1.70.2.1
--- image.el    9 Feb 2007 16:50:16 -0000       1.70
+++ image.el    4 Jun 2007 20:40:53 -0000       1.70.2.1
@@ -343,30 +343,15 @@
 ;;;###autoload
 (defun image-type-auto-detected-p ()
   "Return t iff the current buffer contains an auto-detectable image.
-This function is intended to be used from `magic-mode-alist' (which see).
+This function is intended to be used from `magic-fallback-mode-alist'.
 
-First, compare the beginning of the buffer with `image-type-header-regexps'.
-If an appropriate image type is found, check if that image type can be
-autodetected using the variable `image-type-auto-detectable'.  Finally,
-if `buffer-file-name' is non-nil, check if it matches another major mode
-in `auto-mode-alist' apart from `image-mode'; if there is another match,
-the autodetection is considered to have failed.  Return t if all the above
-steps succeed."
+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'."
   (let* ((type (image-type-from-buffer))
         (auto (and type (cdr (assq type image-type-auto-detectable)))))
     (and auto
-        (or (eq auto t) (image-type-available-p type))
-        (or (null buffer-file-name)
-            (not (assoc-default
-                  buffer-file-name
-                  (delq nil (mapcar 
-                             (lambda (elt)
-                               (unless (memq (or (car-safe (cdr elt))
-                                                 (cdr elt))
-                                             '(image-mode image-mode-maybe))
-                                 elt))
-                             auto-mode-alist))
-                  'string-match))))))
+        (or (eq auto t) (image-type-available-p type)))))
 
 
 ;;;###autoload