From: Glenn Morris <rgm@gnu.org>
Date: Fri, 22 Jun 2012 01:50:35 +0000 (-0400)
Subject: * calendar.el (calendar-in-read-only-buffer): Avoid some needless mode changes.
X-Git-Tag: emacs-24.2.90~1199^2~412
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=89b5595ade3781299f7836c7b7d617314eaf907e;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fb710374e18..c5be8c263d5 100644
--- 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 0d6ea8e7f4c..c47bbdff5ec 100644
--- 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)