procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(diary-float): Fix end-of-year error and typos in comments.

Browse source
This commit is contained in:
Karl Heuer 1998-12-16 21:12:17 +00:00
parent acc81368d1
commit a2faecac77
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lisp/calendar/diary-lib.el
View file

@ -1280,7 +1280,7 @@ An optional parameter DAY means the Nth DAYNAME on or after/before MONTH DAY."
(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 @@ 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 (/= 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 @@ An optional parameter DAY means the Nth DAYNAME on or after/before MONTH DAY."
(<= 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))