* calendar.el (calendar-in-read-only-buffer): Avoid some needless mode changes.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fb710374e18024c09977a7c5a6eac82f384e597b..c5be8c263d5c9dcd8d63158c1996ecff4ff243b2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-22  Glenn Morris  <rgm@gnu.org>
+
+       * calendar/calendar.el (calendar-in-read-only-buffer):
+       Avoid some needless mode changes.
+
 2012-06-21  Chong Yidong  <cyd@gnu.org>
 
        * desktop.el (desktop-read): Don't prompt if daemon (Bug#11674).

diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 0d6ea8e7f4c4a6325ce5dd62444dcfe2e124fabe..c47bbdff5ecfb2a0eb02d746c867f14e7660ca1b 100644 (file)
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1112,7 +1112,7 @@ with disabled undo.  Leaves point at point-min, displays BUFFER."
   (declare (indent 1) (debug t))
   `(progn
      (set-buffer (get-buffer-create ,buffer))
-     (special-mode)
+     (or (derived-mode-p 'special-mode) (special-mode))
      (setq buffer-read-only nil
            buffer-undo-list t)
      (erase-buffer)