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

Minor appt-check fix.

Browse source 
* lisp/calendar/appt.el (appt-check): Rather than showing the diary,
just turn off invisible display, and only if needed.
This commit is contained in:
Glenn Morris 2010-09-14 19:46:00 -07:00
parent 87e798a785
commit 1bf6d0759d
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2010-09-15 Glenn Morris <rgm@gnu.org>
* calendar/appt.el (appt-check): Rather than showing the diary,
just turn off invisible display, and only if needed.
* calendar/diary-lib.el (diary-list-entries): Doc fix. (Bug#7019)
2010-09-14 Stefan Monnier <monnier@iro.umontreal.ca>

22
lisp/calendar/appt.el
View file

@ -345,17 +345,27 @@ displayed in a window:
(selective
(if d-buff ; diary buffer exists
(with-current-buffer d-buff
diary-selective-display))))
diary-selective-display)))
d-buff2)
;; FIXME why not using diary-list-entries with
;; non-nil LIST-ONLY?
(diary)
;; If the diary buffer existed before this command,
;; restore its display state. Otherwise, kill it.
(if d-buff
;; Displays the diary buffer.
(or selective (diary-show-all-entries))
(and (setq d-buff (find-buffer-visiting diary-file))
(kill-buffer d-buff)))))
(and (setq d-buff2 (find-buffer-visiting diary-file))
(if d-buff
(or selective
(with-current-buffer d-buff2
(if diary-selective-display
;; diary-show-all-entries displays
;; the diary buffer.
(diary-unhide-everything))))
;; FIXME does not kill any included diary files.
;; The real issue is that (diary) should not
;; have the side effect of visiting all the
;; diary files. It is not really appt.el's job to
;; clean up this mess...
(kill-buffer d-buff2)))))
(error nil)))
(setq appt-prev-comp-time cur-comp-time
appt-mode-string nil