From 953a8c3b9c08da070b7367f3b0c2c5af95e0b130 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Thu, 2 Feb 2012 02:49:06 +0200 Subject: [PATCH] * lisp/image-mode.el (image-toggle-display-image): Remove tautological `major-mode' from the `derived-mode-p' test. --- lisp/ChangeLog | 5 +++++ lisp/image-mode.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ce373a42e7c..cc6aecd7a26 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-02-02 Juri Linkov + + * image-mode.el (image-toggle-display-image): Remove tautological + `major-mode' from the `derived-mode-p' test. + 2012-02-02 Kenichi Handa * composite.el (compose-region, compose-string): Signal error for diff --git a/lisp/image-mode.el b/lisp/image-mode.el index a9a8d15e6a0..953cb9e94a1 100644 --- 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 -- 2.11.4.GIT