From: Richard M. Stallman Date: Wed, 6 Jan 1999 08:09:27 +0000 (+0000) Subject: (diary-float): Better fix of end-of-year error. X-Git-Tag: emacs-20.4~951 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b5972d799ec150dffdb29036422204d6980f2040;p=emacs.git (diary-float): Better fix of end-of-year error. --- 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." (calendar-last-day-of-month m1 y1))))) (and (<= d1 d) (<= d d2)))) ;; only possible base dates straddle two months - (and (/= m1 m2) + (and (or (< y1 y2) + (and (= y1 y2) (< m1 m2))) (or ;; m1, d1 works as a base date (and