[Emacs-diffs] emacs-24 r117490: * calendar/diary-lib.el (diary-list-entries): Restore 24.3 display behavior.

[Glenn Morris]

------------------------------------------------------------
revno: 117490
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18381
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-09-09 14:09:54 -0400
message:
  * calendar/diary-lib.el (diary-list-entries): Restore 24.3 display behavior.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/calendar/diary-lib.el     diarylib.el-20091113204419-o5vbwnq5f7feedwu-902

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-09-09 15:00:51 +0000
+++ b/lisp/ChangeLog    2014-09-09 18:09:54 +0000
@@ -1,3 +1,8 @@
+2014-09-09  Glenn Morris  <address@hidden>
+
+       * calendar/diary-lib.el (diary-list-entries):
+       Restore 24.3 display behavior.  (Bug#18381)
+
 2014-09-09  Eli Zaretskii  <address@hidden>
 
        * mouse.el (mouse-drag-line): On text-mode frames, count the mode

=== modified file 'lisp/calendar/diary-lib.el'
--- a/lisp/calendar/diary-lib.el        2014-01-01 07:43:34 +0000
+++ b/lisp/calendar/diary-lib.el        2014-09-09 18:09:54 +0000
@@ -1,7 +1,6 @@
 ;;; diary-lib.el --- diary functions
 
-;; Copyright (C) 1989-1990, 1992-1995, 2001-2014 Free Software
-;; Foundation, Inc.
+;; Copyright (C) 1989-1990, 1992-1995, 2001-2014 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <address@hidden>
 ;; Maintainer: Glenn Morris <address@hidden>
@@ -901,12 +900,20 @@
                   ;;;     (diary-include-other-diary-files) ; recurse
                   ;;;   (run-hooks 'diary-list-entries-hook))
                   (unless list-only
-                    (if (and diary-display-function
-                             (listp diary-display-function))
-                        ;; Backwards compatibility.
-                        (run-hooks 'diary-display-function)
-                      (funcall (or diary-display-function
-                                   'diary-simple-display))))
+                    ;; Avoid M-x diary; M-x calendar; M-x diary
+                    ;; clobbering the calendar window.
+                    ;; FIXME this is not the right solution.
+                    (let ((display-buffer-fallback-action
+                           (list (delq
+                                  'display-buffer-in-previous-window
+                                  (copy-sequence
+                                   (car display-buffer-fallback-action))))))
+                      (if (and diary-display-function
+                               (listp diary-display-function))
+                          ;; Backwards compatibility.
+                          (run-hooks 'diary-display-function)
+                        (funcall (or diary-display-function
+                                     'diary-simple-display)))))
                   (run-hooks 'diary-hook)))))
         (and temp-buff (buffer-name temp-buff) (kill-buffer temp-buff)))
       (or d-incp (message "Preparing diary...done"))