aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2004-12-21 15:03:31 +0000
committerGlenn Morris2004-12-21 15:03:31 +0000
commitd0897fa5354a5b582277d1011d9617bb7a00964b (patch)
tree7e4db98c72f881786a1041eb1763c75baa4714b7
parenta74deabc2bac6281a28be8b871d173a1fc6e3f5a (diff)
downloademacs-d0897fa5354a5b582277d1011d9617bb7a00964b.tar.gz
emacs-d0897fa5354a5b582277d1011d9617bb7a00964b.zip
From Markus Rost <rost@ias.edu>:
(mark-diary-entries): Set mark-diary-entries-in-calendar only after checking for diary-file.
-rw-r--r--lisp/calendar/diary-lib.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index fdade091ab2..511f82f8f2f 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -841,11 +841,11 @@ Each entry in the diary file visible in the calendar window is marked.
841After the entries are marked, the hooks `nongregorian-diary-marking-hook' and 841After the entries are marked, the hooks `nongregorian-diary-marking-hook' and
842`mark-diary-entries-hook' are run." 842`mark-diary-entries-hook' are run."
843 (interactive) 843 (interactive)
844 (setq mark-diary-entries-in-calendar t)
845 (let ((marking-diary-entries t) 844 (let ((marking-diary-entries t)
846 file-glob-attrs marks) 845 file-glob-attrs marks)
847 (save-excursion 846 (save-excursion
848 (set-buffer (find-file-noselect (diary-check-diary-file) t)) 847 (set-buffer (find-file-noselect (diary-check-diary-file) t))
848 (setq mark-diary-entries-in-calendar t)
849 (message "Marking diary entries...") 849 (message "Marking diary entries...")
850 (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '()))) 850 (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '())))
851 (let ((d diary-date-forms) 851 (let ((d diary-date-forms)