[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calendar/cal-x.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calendar/cal-x.el,v |
Date: |
Fri, 30 May 2008 02:58:01 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/05/30 02:58:01
Index: cal-x.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-x.el,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- cal-x.el 6 May 2008 03:07:57 -0000 1.45
+++ cal-x.el 30 May 2008 02:58:01 -0000 1.46
@@ -90,21 +90,25 @@
(iconify-or-deiconify-frame)))
;; c-d-d is only called after (diary) has been run.
-(defvar diary-display-hook)
+(defvar diary-display-function)
(defun calendar-dedicate-diary ()
"Display and dedicate the window associated with the diary buffer."
(set-window-dedicated-p
(display-buffer
- (if (not (or (memq 'diary-fancy-display diary-display-hook)
- (memq 'fancy-diary-display diary-display-hook)))
- (get-file-buffer diary-file)
+ (if (if (listp diary-display-function)
+ (or (memq 'diary-fancy-display diary-display-function)
+ (memq 'fancy-diary-display diary-display-function))
+ (memq diary-display-function '(diary-fancy-display
+ fancy-diary-display)))
+ (progn
;; If there are no diary entries, there won't be a fancy-diary
;; to dedicate, so make a basic one.
(or (get-buffer diary-fancy-buffer)
(calendar-in-read-only-buffer diary-fancy-buffer
(calendar-set-mode-line "Diary Entries")))
- diary-fancy-buffer))
+ diary-fancy-buffer)
+ (get-file-buffer diary-file)))
t))
;;;###cal-autoload