(diary-remind): Discard any mark portion from diary-entry. Reported

by Andrew Kemp <ajwk@pell.uklinux.net>.

diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index ecbafd24430a902ecc14d287faf347e06f8aca92..5fbae2500d7770728b1e52d284bbb137182593fb 100644 (file)
--- 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)