Fix bug #8177 with re-visiting image files.

 files.el (find-file-noselect): Don't ask about re-visiting
 non-literally if the file is already visited in image-mode.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aeb7c8edff49280a1c2b2add5b2211b95df329a1..047d8bb5dcc9204e89d6f5424b81cbc8723a23c1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-05  Eli Zaretskii  <eliz@gnu.org>
+
+       * files.el (find-file-noselect): Don't ask about re-visiting
+       non-literally if the file is already visited in image-mode.
+       (Bug#8177)
+
 2011-03-05  Glenn Morris  <rgm@gnu.org>
 
        * eshell/esh-mode.el (eshell-kill-buffer-function): New function.

diff --git a/lisp/files.el b/lisp/files.el
index a8f937233de928ccb87d5ae5a21ef706aab21680..52ccbbf86dda7980958a94ff265ccbd6483d0e1b 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1894,8 +1894,8 @@ the various files."
                           (not nonexistent)
                           ;; It is confusing to ask whether to visit
                           ;; non-literally if they have the file in
-                          ;; hexl-mode.
-                          (not (eq major-mode 'hexl-mode)))
+                          ;; hexl-mode or image-mode.
+                          (not (memq major-mode '(hexl-mode image-mode))))
                  (if (buffer-modified-p)
                      (if (y-or-n-p
                           (format