[Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el

[Glenn Morris]

Index: emacs/lisp/calendar/diary-lib.el
diff -c emacs/lisp/calendar/diary-lib.el:1.87 
emacs/lisp/calendar/diary-lib.el:1.88
*** emacs/lisp/calendar/diary-lib.el:1.87       Wed Feb  9 15:50:40 2005
--- emacs/lisp/calendar/diary-lib.el    Sun Feb 27 22:46:03 2005
***************
*** 1625,1632 ****
             (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 ""))))
       ;; Diary entry may apply to one of a list of days before date
       ((and (listp days) days)
        (or (diary-remind sexp (car days) marking)
--- 1625,1634 ----
             (or (not marking-diary-entries) marking))
        (let ((date (calendar-gregorian-from-absolute
                     (+ (calendar-absolute-from-gregorian date) days))))
!         (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)