Commit d7a3bb02 authored by Glenn Morris's avatar Glenn Morris

* calendar/diary-lib.el (diary-list-entries): Restore 24.3 display behavior.

Fixes: debbugs:18381
parent b0fb3436
2014-09-09 Glenn Morris <rgm@gnu.org>
* calendar/diary-lib.el (diary-list-entries):
Restore 24.3 display behavior. (Bug#18381)
2014-09-09 Eli Zaretskii <eliz@gnu.org>
* mouse.el (mouse-drag-line): On text-mode frames, count the mode
......
;;; 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 <reingold@cs.uiuc.edu>
;; Maintainer: Glenn Morris <rgm@gnu.org>
......@@ -901,12 +900,20 @@ LIST-ONLY is non-nil, in which case it just returns the list."
;;; (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"))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment