2 files changed, 16 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 45e1b41765a..155b4804ebd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2009-09-04  Glenn Morris  <rgm@gnu.org>
 
+        * calendar/diary-lib.el (diary-fancy-display): Only switch modes if
+        necessary.
+        (diary-fancy-overriding-map): New variable.
+        (diary-fancy-display-mode): Set minor-mode-overriding-map-alist.
+        Use view-mode.
+
         * vc-rcs.el (vc-rcs-annotate-command): Use forward-line rather than
         goto-line.
 
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 732f2150001..1975be6c2ea 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -1019,7 +1019,8 @@ This is an option for `diary-display-function'."
                      (overlay-put
                       (make-overlay (match-beginning 0) (match-end 0))
                       'face temp-face)))))))
-      (diary-fancy-display-mode)
+      (or (eq major-mode 'diary-fancy-display-mode)
+          (diary-fancy-display-mode))
       (calendar-set-mode-line date-string)
       (message "Preparing diary...done"))))
 
@@ -2348,6 +2349,11 @@ Fontify the region between BEG and END, quietly unless VERBOSE is non-nil."
       (setq end (line-beginning-position 2)))
   (font-lock-default-fontify-region beg end verbose))
 
+(defvar diary-fancy-overriding-map (let ((map (make-sparse-keymap)))
+                                     (define-key map "q" 'quit-window)
+                                     map)
+  "Keymap overriding minor-mode maps in `diary-fancy-display-mode'.")
+
 (define-derived-mode diary-fancy-display-mode fundamental-mode
   "Diary"
   "Major mode used while displaying diary entries using Fancy Display."
@@ -2356,7 +2362,9 @@ Fontify the region between BEG and END, quietly unless VERBOSE is non-nil."
          t nil nil nil
          (font-lock-fontify-region-function
           . diary-fancy-font-lock-fontify-region-function)))
-  (local-set-key "q" 'quit-window))
+  (set (make-local-variable 'minor-mode-overriding-map-alist)
+       (list (cons t diary-fancy-overriding-map)))
+  (view-mode 1))
 
 (define-obsolete-function-alias 'fancy-diary-display-mode
   'diary-fancy-display-mode "23.1")