Mercurial > emacs
comparison lisp/calendar/diary-lib.el @ 23998:6a6bb17fba97
(diary-float): Better fix of end-of-year error.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Wed, 06 Jan 1999 08:09:27 +0000 |
| parents | 2a56bdf4cef7 |
| children | 1baa5a4968b2 |
comparison
equal
deleted
inserted
replaced
| 23997:bbe0c369b955 | 23998:6a6bb17fba97 |
|---|---|
| 1287 (let ((d (or day (if (> n 0) | 1287 (let ((d (or day (if (> n 0) |
| 1288 1 | 1288 1 |
| 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 |
| 1296 (or (and (listp month) (memq m1 month)) | 1297 (or (and (listp month) (memq m1 month)) |
| 1297 (eq month t) | 1298 (eq month t) |