aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-04-29 03:34:40 +0000
committerGlenn Morris2008-04-29 03:34:40 +0000
commita478b7bc2fb65ac2299d1972ccd9d50fef351569 (patch)
tree289a20b3db7ef1da13d9e14fbeb74d175b1accf0
parente705756857160c0c22c715a026b4dc75d0b304da (diff)
downloademacs-a478b7bc2fb65ac2299d1972ccd9d50fef351569.tar.gz
emacs-a478b7bc2fb65ac2299d1972ccd9d50fef351569.zip
(diary-list-sexp-entries, diary-float): Doc fix.
-rw-r--r--lisp/calendar/diary-lib.el25
1 files changed, 13 insertions, 12 deletions
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index a62af9169ed..9d39c2ea821 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -1606,12 +1606,13 @@ DAY MONTH YEAR in the European style).
1606 be a list of integers, `t' (meaning all values), or an integer. 1606 be a list of integers, `t' (meaning all values), or an integer.
1607 1607
1608 %%(diary-float MONTH DAYNAME N &optional DAY MARK) text 1608 %%(diary-float MONTH DAYNAME N &optional DAY MARK) text
1609 Entry will appear on the Nth DAYNAME of MONTH (0 being Sunday, 1609 Entry will appear on the Nth DAYNAME after/before MONTH DAY.
1610 1 Monday, etc; if N is negative it counts backward from the end 1610 DAYNAME=0 means Sunday, DAYNAME=1 means Monday, and so on.
1611 of the month. MONTH can be a list of months, a single month, or `t' 1611 If N>0, use the Nth DAYNAME after MONTH DAY.
1612 to specify all months. Optional DAY means the Nth DAYNAME of MONTH 1612 If N<0, use the Nth DAYNAME before MONTH DAY.
1613 on or after/before DAY. DAY defaults to 1 if N>0 and the last day of 1613 DAY defaults to 1 if N>0, and MONTH's last day otherwise.
1614 the month if N<0. 1614 MONTH can be a list of months, a single month, or `t' to
1615 specify all months.
1615 1616
1616 %%(diary-block M1 D1 Y1 M2 D2 Y2 &optional MARK) text 1617 %%(diary-block M1 D1 Y1 M2 D2 Y2 &optional MARK) text
1617 Entry will appear on dates between M1/D1/Y1 and M2/D2/Y2, 1618 Entry will appear on dates between M1/D1/Y1 and M2/D2/Y2,
@@ -1793,12 +1794,12 @@ use when highlighting the day in the calendar."
1793 1794
1794;; To be called from diary-sexp-entry, where DATE, ENTRY are bound. 1795;; To be called from diary-sexp-entry, where DATE, ENTRY are bound.
1795(defun diary-float (month dayname n &optional day mark) 1796(defun diary-float (month dayname n &optional day mark)
1796 "Floating diary entry--entry applies if date is the nth dayname of month. 1797 "Diary entry for the Nth DAYNAME after/before MONTH DAY.
1797Parameters are MONTH, DAYNAME, N. MONTH can be a list of months, an integer, 1798DAYNAME=0 means Sunday, DAYNAME=1 means Monday, and so on.
1798or `t' (meaning all months). If N is negative, count backward from the end 1799If N>0, use the Nth DAYNAME after MONTH DAY.
1799of the month. 1800If N<0, use the Nth DAYNAME before MONTH DAY.
1800 1801DAY defaults to 1 if N>0, and MONTH's last day otherwise.
1801An optional parameter DAY means the Nth DAYNAME on or after/before MONTH DAY. 1802MONTH can be a list of months, an integer, or `t' (meaning all months).
1802Optional MARK specifies a face or single-character string to use when 1803Optional MARK specifies a face or single-character string to use when
1803highlighting the day in the calendar." 1804highlighting the day in the calendar."
1804 ;; This is messy because the diary entry may apply, but the date on which it 1805 ;; This is messy because the diary entry may apply, but the date on which it