* lisp/image-mode.el (image-toggle-display-image): Remove tautological `major-mode'

from the `derived-mode-p' test.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce373a42e7cbe6a53d9bbcc07ad5d4422c62ed8b..cc6aecd7a2695e4161d96aeb4f78218d6a81a1ee 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-02  Juri Linkov  <juri@jurta.org>
+
+       * image-mode.el (image-toggle-display-image): Remove tautological
+       `major-mode' from the `derived-mode-p' test.
+
 2012-02-02  Kenichi Handa  <handa@m17n.org>
 
        * composite.el (compose-region, compose-string): Signal error for

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index a9a8d15e6a024854c17dc173eed6d346ee625bb1..953cb9e94a11daa6a1d32271a53046f2c0bd1cbb 100644 (file)
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -482,7 +482,7 @@ Remove text properties that display the image."
   "Show the image of the image file.
 Turn the image data into a real image, but only if the whole file
 was inserted."
-  (unless (derived-mode-p 'image-mode major-mode)
+  (unless (derived-mode-p 'image-mode)
     (error "The buffer is not in Image mode"))
   (let* ((filename (buffer-file-name))
         (data-p (not (and filename