diff options
| author | Glenn Morris | 2008-04-10 05:20:15 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-04-10 05:20:15 +0000 |
| commit | 6e81a223a467cd1fcbd5ff88cab8c29766044bc1 (patch) | |
| tree | e4f1bd09e0d70a11d6b16401040f7de3c18ad96b | |
| parent | d58ee9f1754a6f83b52d0250006323e6a21178a6 (diff) | |
| download | emacs-6e81a223a467cd1fcbd5ff88cab8c29766044bc1.tar.gz emacs-6e81a223a467cd1fcbd5ff88cab8c29766044bc1.zip | |
(diary-mark-sexp-entries): Fix replacement of calendar-for-loop.
| -rw-r--r-- | lisp/ChangeLog | 1 | ||||
| -rw-r--r-- | lisp/calendar/diary-lib.el | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5fb0f0c0f95..ac651f3a10d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | * calendar/appt.el (appt): Add :prefix. | 22 | * calendar/appt.el (appt): Add :prefix. |
| 23 | 23 | ||
| 24 | * calendar/diary-lib.el (diary-hook): Doc fix. | 24 | * calendar/diary-lib.el (diary-hook): Doc fix. |
| 25 | (diary-mark-sexp-entries): Fix replacement of calendar-for-loop. | ||
| 25 | 26 | ||
| 26 | 2008-04-10 Stefan Monnier <monnier@iro.umontreal.ca> | 27 | 2008-04-10 Stefan Monnier <monnier@iro.umontreal.ca> |
| 27 | 28 | ||
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 61b46a2cc97..4f0724b0f33 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el | |||
| @@ -1325,8 +1325,7 @@ is marked. See the documentation for the function `diary-list-sexp-entries'." | |||
| 1325 | (setq m displayed-month | 1325 | (setq m displayed-month |
| 1326 | y displayed-year)) | 1326 | y displayed-year)) |
| 1327 | (calendar-increment-month m y -1) | 1327 | (calendar-increment-month m y -1) |
| 1328 | (setq first-date (calendar-absolute-from-gregorian (list m 1 y)) | 1328 | (setq first-date (calendar-absolute-from-gregorian (list m 1 y))) |
| 1329 | date (1- first-date)) | ||
| 1330 | (calendar-increment-month m y 2) | 1329 | (calendar-increment-month m y 2) |
| 1331 | (setq last-date | 1330 | (setq last-date |
| 1332 | (calendar-absolute-from-gregorian | 1331 | (calendar-absolute-from-gregorian |
| @@ -1351,6 +1350,7 @@ is marked. See the documentation for the function `diary-list-sexp-entries'." | |||
| 1351 | (forward-line 1)) | 1350 | (forward-line 1)) |
| 1352 | (if (bolp) (backward-char 1)) | 1351 | (if (bolp) (backward-char 1)) |
| 1353 | (setq entry (buffer-substring-no-properties entry-start (point)))) | 1352 | (setq entry (buffer-substring-no-properties entry-start (point)))) |
| 1353 | (setq date (1- first-date)) | ||
| 1354 | (while (<= (setq date (1+ date)) last-date) | 1354 | (while (<= (setq date (1+ date)) last-date) |
| 1355 | (when (setq mark (diary-sexp-entry | 1355 | (when (setq mark (diary-sexp-entry |
| 1356 | sexp entry | 1356 | sexp entry |