From: Glenn Morris Date: Sun, 27 Feb 2005 22:46:03 +0000 (+0000) Subject: (diary-remind): Discard any mark portion from diary-entry. Reported X-Git-Tag: ttn-vms-21-2-B4~2080 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=07a66b979b9f3ccc1ffd8ee87377b3e434f86151;p=emacs.git (diary-remind): Discard any mark portion from diary-entry. Reported by Andrew Kemp . --- diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index ecbafd24430..5fbae2500d7 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)