diff options
| author | Romain Francoise | 2005-09-19 16:03:51 +0000 |
|---|---|---|
| committer | Romain Francoise | 2005-09-19 16:03:51 +0000 |
| commit | 12b8cf536a0507150a4824fe619631d60322cdce (patch) | |
| tree | 88859479e6fa81cc312598d019abbef964399ca0 | |
| parent | 5d4247d31a0e3377afeb20b878c6cb90bb695e53 (diff) | |
| download | emacs-12b8cf536a0507150a4824fe619631d60322cdce.tar.gz emacs-12b8cf536a0507150a4824fe619631d60322cdce.zip | |
(mark-diary-entries): Revert last change.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/calendar/diary-lib.el | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e2ef572c6c2..7e98ed9b2f7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2005-09-19 Romain Francoise <romain@orebokech.com> | ||
| 2 | |||
| 3 | * calendar/diary-lib.el (mark-diary-entries): Revert last change. | ||
| 4 | |||
| 1 | 2005-09-19 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2005-09-19 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * font-lock.el (font-lock-default-fontify-region): | 7 | * font-lock.el (font-lock-default-fontify-region): |
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index b748d15e41c..3b634caaa9c 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el | |||
| @@ -864,8 +864,8 @@ diary entries." | |||
| 864 | (redraw-calendar)) | 864 | (redraw-calendar)) |
| 865 | (let ((marking-diary-entries t) | 865 | (let ((marking-diary-entries t) |
| 866 | file-glob-attrs marks) | 866 | file-glob-attrs marks) |
| 867 | (save-excursion | 867 | (with-current-buffer (find-file-noselect (diary-check-diary-file) t) |
| 868 | (with-current-buffer (find-file-noselect (diary-check-diary-file) t) | 868 | (save-excursion |
| 869 | (setq mark-diary-entries-in-calendar t) | 869 | (setq mark-diary-entries-in-calendar t) |
| 870 | (message "Marking diary entries...") | 870 | (message "Marking diary entries...") |
| 871 | (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '()))) | 871 | (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '()))) |