Mercurial > emacs
changeset 60298:6f85d024a41d
(diary-remind): Discard any mark portion from diary-entry. Reported
by Andrew Kemp <ajwk@pell.uklinux.net>.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sun, 27 Feb 2005 22:46:03 +0000 |
| parents | 59d1782d5bca |
| children | 70e25b87a334 |
| files | lisp/calendar/diary-lib.el |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calendar/diary-lib.el Sun Feb 27 21:42:43 2005 +0000 +++ b/lisp/calendar/diary-lib.el Sun Feb 27 22:46:03 2005 +0000 @@ -1625,8 +1625,10 @@ (or (not marking-diary-entries) marking)) (let ((date (calendar-gregorian-from-absolute (+ (calendar-absolute-from-gregorian date) days)))) - (if (setq diary-entry (eval sexp)) - (mapconcat 'eval diary-remind-message "")))) + (when (setq diary-entry (eval sexp)) ; re-evaluate with adjusted date + ;; Discard any mark portion from diary-anniversary, etc. + (if (consp diary-entry) (setq diary-entry (cdr diary-entry))) + (mapconcat 'eval diary-remind-message "")))) ;; Diary entry may apply to one of a list of days before date ((and (listp days) days) (or (diary-remind sexp (car days) marking)