[Emacs-diffs] /srv/bzr/emacs/trunk r107052: * lisp/image-mode.el (image-toggle-display-image): Remove tautological `major-mode'

[Juri Linkov]

------------------------------------------------------------
revno: 107052
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Thu 2012-02-02 02:49:06 +0200
message:
  * lisp/image-mode.el (image-toggle-display-image): Remove tautological 
`major-mode'
  from the `derived-mode-p' test.
modified:
  lisp/ChangeLog
  lisp/image-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-02 00:32:12 +0000
+++ b/lisp/ChangeLog    2012-02-02 00:49:06 +0000
@@ -1,3 +1,8 @@
+2012-02-02  Juri Linkov  <address@hidden>
+
+       * image-mode.el (image-toggle-display-image): Remove tautological
+       `major-mode' from the `derived-mode-p' test.
+
 2012-02-02  Kenichi Handa  <address@hidden>
 
        * composite.el (compose-region, compose-string): Signal error for

=== modified file 'lisp/image-mode.el'
--- a/lisp/image-mode.el        2012-01-19 07:21:25 +0000
+++ b/lisp/image-mode.el        2012-02-02 00:49:06 +0000
@@ -482,7 +482,7 @@
   "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