procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* cal-x.el (calendar-dedicate-diary): Drop support for deleted aliases.

Browse source
This commit is contained in:
Glenn Morris 2014-10-08 14:30:45 -04:00
parent 97272dad9f
commit 289a43910e
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2014-10-08 Glenn Morris <rgm@gnu.org>
* calendar/cal-x.el (calendar-dedicate-diary):
Drop support for recently deleted aliases.
2014-10-08 Leo Liu <sdl.web@gmail.com>
* progmodes/cfengine.el (cfengine3-make-syntax-cache): Always

8
lisp/calendar/cal-x.el
View file

@ -94,12 +94,10 @@ Runs `calendar-after-frame-setup-hook', selects frame, iconifies if needed."
(set-window-dedicated-p
(display-buffer
(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)))
(memq 'diary-fancy-display diary-display-function)
(eq diary-display-function 'diary-fancy-display))
(progn
;; If there are no diary entries, there won't be a fancy-diary
;; If there are no diary entries, there won't be a buffer
;; to dedicate, so make a basic one.
(or (get-buffer diary-fancy-buffer)
(calendar-in-read-only-buffer diary-fancy-buffer