Mercurial > emacs
changeset 23908:2a56bdf4cef7
(diary-float): Fix end-of-year error and typos in comments.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Wed, 16 Dec 1998 21:12:17 +0000 |
| parents | 2cd294915abd |
| children | 040b8e4d01e7 |
| files | lisp/calendar/diary-lib.el |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calendar/diary-lib.el Wed Dec 16 20:51:34 1998 +0000 +++ b/lisp/calendar/diary-lib.el Wed Dec 16 21:12:17 1998 +0000 @@ -1280,7 +1280,7 @@ (m2 (extract-calendar-month last)) (d2 (extract-calendar-day last)) (y2 (extract-calendar-year last))) - (if (or (and (= m1 m2) ; only possible base dates in one month + (if (or (and (= m1 m2) ; only possible base dates in one month (or (and (listp month) (memq m1 month)) (eq month t) (= m1 month)) @@ -1289,9 +1289,9 @@ (calendar-last-day-of-month m1 y1))))) (and (<= d1 d) (<= d d2)))) ;; only possible base dates straddle two months - (and (< m1 m2) + (and (/= m1 m2) (or - ;; m1, d1 works is a base date + ;; m1, d1 works as a base date (and (or (and (listp month) (memq m1 month)) (eq month t) @@ -1299,7 +1299,7 @@ (<= d1 (or day (if (> n 0) 1 (calendar-last-day-of-month m1 y1))))) - ;; m2, d2 works is a base date + ;; m2, d2 works as a base date (and (or (and (listp month) (memq m2 month)) (eq month t) (= m2 month))