diff options
author | Glenn Morris <[email protected]> | 2005-02-27 22:46:03 +0000 |
---|---|---|
committer | Glenn Morris <[email protected]> | 2005-02-27 22:46:03 +0000 |
commit | 07a66b979b9f3ccc1ffd8ee87377b3e434f86151 (patch) | |
tree | bf4f2eec6266ce482fe686828c7128a7c56d0760 /lisp | |
parent | 04c9dde8afc535589a1a4803b45b346325e353e7 (diff) |
(diary-remind): Discard any mark portion from diary-entry. Reported
by Andrew Kemp <[email protected]>.
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/calendar/diary-lib.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index ecbafd2443..5fbae2500d 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -1625,8 +1625,10 @@ marked on the calendar." (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) |