[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,v |
Date: |
Wed, 16 Apr 2008 03:23:32 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/04/16 03:23:31
Index: diary-lib.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/diary-lib.el,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -b -r1.169 -r1.170
--- diary-lib.el 12 Apr 2008 03:11:49 -0000 1.169
+++ diary-lib.el 16 Apr 2008 03:23:30 -0000 1.170
@@ -1929,8 +1929,8 @@
Marking of reminders is independent of whether the entry itself is a marking
or nonmarking; if optional parameter MARKING is non-nil then the reminders are
marked on the calendar."
- (let ((diary-entry (eval sexp))
- date)
+ ;; `date' has a value at this point, from diary-sexp-entry.
+ (let ((diary-entry (eval sexp)))
(cond
;; Diary entry applies on date.
((and diary-entry
@@ -1940,12 +1940,13 @@
((and (integerp days)
(not diary-entry) ; diary entry does not apply to date
(or (not diary-marking-entries-flag) marking))
- (setq date (calendar-gregorian-from-absolute
- (+ (calendar-absolute-from-gregorian date) days)))
- (when (setq diary-entry (eval sexp)) ; re-evaluate with adjusted date
+ ;; Adjust date, and re-evaluate.
+ (let ((date (calendar-gregorian-from-absolute
+ (+ (calendar-absolute-from-gregorian date) days))))
+ (when (setq diary-entry (eval sexp))
;; Discard any mark portion from diary-anniversary, etc.
(if (consp diary-entry) (setq diary-entry (cdr diary-entry)))
- (mapconcat 'eval diary-remind-message "")))
+ (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)
- [Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,v, (continued)
- [Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,v, Glenn Morris, 2008/04/05
- [Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,v, Glenn Morris, 2008/04/05
- [Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,v, Glenn Morris, 2008/04/05
- [Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,v, Glenn Morris, 2008/04/05
- [Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,v, Glenn Morris, 2008/04/06
- [Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,v, Glenn Morris, 2008/04/06
- [Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,v, Glenn Morris, 2008/04/09
- [Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,v, Glenn Morris, 2008/04/10
- [Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,v, Glenn Morris, 2008/04/10
- [Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,v, Glenn Morris, 2008/04/11
- [Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,v,
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,v, Glenn Morris, 2008/04/22
- [Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,v, Glenn Morris, 2008/04/28