aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Heuer1998-12-16 21:12:17 +0000
committerKarl Heuer1998-12-16 21:12:17 +0000
commita2faecac7767ea9a02fed7b1907f4cceff7c341c (patch)
treebf1bec90534b31c74427097dda15b477f1d99cb3
parentacc81368d1094c022ca7b09fe44cfd4f6e57b2ec (diff)
downloademacs-a2faecac7767ea9a02fed7b1907f4cceff7c341c.tar.gz
emacs-a2faecac7767ea9a02fed7b1907f4cceff7c341c.zip
(diary-float): Fix end-of-year error and typos in comments.
-rw-r--r--lisp/calendar/diary-lib.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 2f0dfd7cfc2..88df6ab6fc9 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -1280,7 +1280,7 @@ An optional parameter DAY means the Nth DAYNAME on or after/before MONTH DAY."
1280 (m2 (extract-calendar-month last)) 1280 (m2 (extract-calendar-month last))
1281 (d2 (extract-calendar-day last)) 1281 (d2 (extract-calendar-day last))
1282 (y2 (extract-calendar-year last))) 1282 (y2 (extract-calendar-year last)))
1283 (if (or (and (= m1 m2) ; only possible base dates in one month 1283 (if (or (and (= m1 m2) ; only possible base dates in one month
1284 (or (and (listp month) (memq m1 month)) 1284 (or (and (listp month) (memq m1 month))
1285 (eq month t) 1285 (eq month t)
1286 (= m1 month)) 1286 (= m1 month))
@@ -1289,9 +1289,9 @@ 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 (/= m1 m2)
1293 (or 1293 (or
1294 ;; m1, d1 works is a base date 1294 ;; m1, d1 works as a base date
1295 (and 1295 (and
1296 (or (and (listp month) (memq m1 month)) 1296 (or (and (listp month) (memq m1 month))
1297 (eq month t) 1297 (eq month t)
@@ -1299,7 +1299,7 @@ An optional parameter DAY means the Nth DAYNAME on or after/before MONTH DAY."
1299 (<= d1 (or day (if (> n 0) 1299 (<= d1 (or day (if (> n 0)
1300 1 1300 1
1301 (calendar-last-day-of-month m1 y1))))) 1301 (calendar-last-day-of-month m1 y1)))))
1302 ;; m2, d2 works is a base date 1302 ;; m2, d2 works as a base date
1303 (and (or (and (listp month) (memq m2 month)) 1303 (and (or (and (listp month) (memq m2 month))
1304 (eq month t) 1304 (eq month t)
1305 (= m2 month)) 1305 (= m2 month))