diff options
| author | Richard M. Stallman | 1999-01-06 08:09:27 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1999-01-06 08:09:27 +0000 |
| commit | b5972d799ec150dffdb29036422204d6980f2040 (patch) | |
| tree | 3366cc3e9440acab47d94088ce2698755451face | |
| parent | 45d1e4d4427045e7b8bea3035dbf1cef3be16b5c (diff) | |
| download | emacs-b5972d799ec150dffdb29036422204d6980f2040.tar.gz emacs-b5972d799ec150dffdb29036422204d6980f2040.zip | |
(diary-float): Better fix of end-of-year error.
| -rw-r--r-- | lisp/calendar/diary-lib.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 88df6ab6fc9..6647bc2b351 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el | |||
| @@ -1289,7 +1289,8 @@ An optional parameter DAY means the Nth DAYNAME on or after/before MONTH DAY." | |||
| 1289 | (calendar-last-day-of-month m1 y1))))) | 1289 | (calendar-last-day-of-month m1 y1))))) |
| 1290 | (and (<= d1 d) (<= d d2)))) | 1290 | (and (<= d1 d) (<= d d2)))) |
| 1291 | ;; only possible base dates straddle two months | 1291 | ;; only possible base dates straddle two months |
| 1292 | (and (/= m1 m2) | 1292 | (and (or (< y1 y2) |
| 1293 | (and (= y1 y2) (< m1 m2))) | ||
| 1293 | (or | 1294 | (or |
| 1294 | ;; m1, d1 works as a base date | 1295 | ;; m1, d1 works as a base date |
| 1295 | (and | 1296 | (and |