aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Zaborsky1992-10-06 21:06:25 +0000
committerChristopher Zaborsky1992-10-06 21:06:25 +0000
commiteabf7f96e1f299d10a34c5a4f5bc60332cdf144d (patch)
tree0ffc26df215377412c2abc8e8b449487816f4ed0
parentc2ced5d8c1a860c85285355c74d687822b6c1e68 (diff)
downloademacs-eabf7f96e1f299d10a34c5a4f5bc60332cdf144d.tar.gz
emacs-eabf7f96e1f299d10a34c5a4f5bc60332cdf144d.zip
Dox fix.
-rw-r--r--lisp/diary-lib.el28
1 files changed, 15 insertions, 13 deletions
diff --git a/lisp/diary-lib.el b/lisp/diary-lib.el
index 2579ecc264d..95c36d3048b 100644
--- a/lisp/diary-lib.el
+++ b/lisp/diary-lib.el
@@ -972,8 +972,8 @@ is provided for use as part of the nongregorian-diary-marking-hook."
972 (setq d (cdr d))))) 972 (setq d (cdr d)))))
973 973
974(defun mark-hebrew-calendar-date-pattern (month day year) 974(defun mark-hebrew-calendar-date-pattern (month day year)
975 "Mark all dates in the calendar window that conform to the Hebrew date 975 "Mark dates in calendar window that conform to Hebrew date MONTH/DAY/YEAR.
976MONTH/DAY/YEAR. A value of 0 in any position is a wild-card." 976A value of 0 in any position is a wild-card."
977 (save-excursion 977 (save-excursion
978 (set-buffer calendar-buffer) 978 (set-buffer calendar-buffer)
979 (if (and (/= 0 month) (/= 0 day)) 979 (if (and (/= 0 month) (/= 0 day))
@@ -1244,8 +1244,9 @@ best if they are nonmarking."
1244 nil)))) 1244 nil))))
1245 1245
1246(defun diary-block (m1 d1 y1 m2 d2 y2) 1246(defun diary-block (m1 d1 y1 m2 d2 y2)
1247 "Block diary entry--entry applies if date is between two dates. Order of 1247 "Block diary entry.
1248the parameters is M1, D1, Y1, M2, D2, Y2 `european-calendar-style' is nil, and 1248Entry applies if date is between two dates. Order of the parameters is
1249M1, D1, Y1, M2, D2, Y2 `european-calendar-style' is nil, and
1249D1, M1, Y1, D2, M2, Y2 if `european-calendar-style' is t." 1250D1, M1, Y1, D2, M2, Y2 if `european-calendar-style' is t."
1250 (let ((date1 (calendar-absolute-from-gregorian 1251 (let ((date1 (calendar-absolute-from-gregorian
1251 (if european-calendar-style 1252 (if european-calendar-style
@@ -1274,9 +1275,10 @@ backward from the end of the month."
1274 entry))) 1275 entry)))
1275 1276
1276(defun diary-anniversary (month day year) 1277(defun diary-anniversary (month day year)
1277 "Anniversary diary entry--entry applies if date is the anniversary of 1278 "Anniversary diary entry.
1278MONTH, DAY, YEAR if `european-calendar-style' is nil, and DAY, MONTH, YEAR 1279Entry applies if date is the anniversary of MONTH, DAY, YEAR if
1279if `european-calendar-style' is t. Diary entry can contain `%d' or `%d%s'; the 1280`european-calendar-style' is nil, and DAY, MONTH, YEAR if
1281`european-calendar-style' is t. Diary entry can contain `%d' or `%d%s'; the
1280%d will be replaced by the number of years since the MONTH DAY, YEAR and the 1282%d will be replaced by the number of years since the MONTH DAY, YEAR and the
1281%s will be replaced by the ordinal ending of that number (that is, `st', `nd', 1283%s will be replaced by the ordinal ending of that number (that is, `st', `nd',
1282`rd' or `th', as appropriate. The anniversary of February 29 is considered 1284`rd' or `th', as appropriate. The anniversary of February 29 is considered
@@ -1372,8 +1374,8 @@ ending of that number (that is, `st', `nd', `rd' or `th', as appropriate."
1372 (+ 1721425 (calendar-absolute-from-gregorian date)))) 1374 (+ 1721425 (calendar-absolute-from-gregorian date))))
1373 1375
1374(defun diary-omer () 1376(defun diary-omer ()
1375 "Omer count diary entry--entry applies if date is within 50 days after 1377 "Omer count diary entry.
1376Passover." 1378Entry applies if date is within 50 days after Passover."
1377 (let* ((passover 1379 (let* ((passover
1378 (calendar-absolute-from-hebrew 1380 (calendar-absolute-from-hebrew
1379 (list 1 15 (+ (extract-calendar-year date) 3760)))) 1381 (list 1 15 (+ (extract-calendar-year date) 3760))))
@@ -1423,8 +1425,8 @@ order of the parameters is changed to DEATH-DAY, DEATH-MONTH, DEATH-YEAR."
1423 (t "th")))))) 1425 (t "th"))))))
1424 1426
1425(defun diary-rosh-hodesh () 1427(defun diary-rosh-hodesh ()
1426 "Rosh Hodesh diary entry--entry applies if date is Rosh Hodesh, the day 1428 "Rosh Hodesh diary entry.
1427before, or the Saturday before." 1429Entry applies if date is Rosh Hodesh, the day before, or the Saturday before."
1428 (let* ((d (calendar-absolute-from-gregorian date)) 1430 (let* ((d (calendar-absolute-from-gregorian date))
1429 (h-date (calendar-hebrew-from-absolute d)) 1431 (h-date (calendar-hebrew-from-absolute d))
1430 (h-month (extract-calendar-month h-date)) 1432 (h-month (extract-calendar-month h-date))
@@ -1853,8 +1855,8 @@ provided for use as part of the nongregorian-diary-marking-hook."
1853 (setq d (cdr d))))) 1855 (setq d (cdr d)))))
1854 1856
1855(defun mark-islamic-calendar-date-pattern (month day year) 1857(defun mark-islamic-calendar-date-pattern (month day year)
1856 "Mark all dates in the calendar window that conform to the Islamic date 1858 "Mark dates in calendar window that conform to Islamic date MONTH/DAY/YEAR.
1857MONTH/DAY/YEAR. A value of 0 in any position is a wild-card." 1859A value of 0 in any position is a wild-card."
1858 (save-excursion 1860 (save-excursion
1859 (set-buffer calendar-buffer) 1861 (set-buffer calendar-buffer)
1860 (if (and (/= 0 month) (/= 0 day)) 1862 (if (and (/= 0 month) (/= 0 day))