Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 10:27:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

* lisp/calendar/appt.el (appt-check): Minor simplification.

Browse source
This commit is contained in:
Glenn Morris 2010-09-27 20:00:09 -07:00
parent b2fa3a0916
commit 97ce27303d
2 changed files with 20 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2010-09-28 Glenn Morris <rgm@gnu.org>
* calendar/appt.el (appt-check): Minor simplification.
2010-09-28 Katsumi Yamaoka <yamaoka@jpl.org>
* mail/sendmail.el (mail-citation-prefix-regexp): Remove "}" from

48
lisp/calendar/appt.el
View file

@ -335,41 +335,25 @@ displayed in a window:
(null appt-prev-comp-time) ; first check
(< cur-comp-time appt-prev-comp-time)) ; new day
(ignore-errors
(if appt-display-diary
(let ((diary-hook
(if (assoc 'appt-make-list diary-hook)
diary-hook
(cons 'appt-make-list diary-hook))))
(diary))
(let* ((diary-display-function 'appt-make-list)
(d-buff (find-buffer-visiting diary-file))
(selective
(if d-buff ; diary buffer exists
(with-current-buffer d-buff
diary-selective-display)))
d-buff2)
(let ((diary-hook (if (assoc 'appt-make-list diary-hook)
diary-hook
(cons 'appt-make-list diary-hook)))
d-buff d-buff2)
(if appt-display-diary
(diary)
(setq d-buff (find-buffer-visiting diary-file))
;; Not displaying the diary, so we can ignore
;; diary-number-of-entries. Since appt.el only
;; works on a daily basis, no need for more entries.
;; FIXME why not using diary-list-entries with
;; non-nil LIST-ONLY?
(diary 1)
;; If the diary buffer existed before this command,
;; restore its display state. Otherwise, kill it.
(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)))))))
(diary-list-entries (calendar-current-date) 1 t)
;; If diary buffer did not exist before this command, kill it.
;; 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...
(and (not d-buff)
(setq d-buff2 (find-buffer-visiting diary-file))
(kill-buffer d-buff2))))))
(setq appt-prev-comp-time cur-comp-time
appt-mode-string nil
appt-display-count nil)