diff options
| author | Glenn Morris | 2008-08-10 20:07:11 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-08-10 20:07:11 +0000 |
| commit | 9cc03d33081054a625d3a766d68d307e49c8802e (patch) | |
| tree | 8c7e4edd4a23a0f05931a9e7b174ba2f1ab4fc41 | |
| parent | 00d66ed4bd76f3d91320e6bf4c4de424b50ab923 (diff) | |
| download | emacs-9cc03d33081054a625d3a766d68d307e49c8802e.tar.gz emacs-9cc03d33081054a625d3a766d68d307e49c8802e.zip | |
(calendar-nth-named-absday, calendar-nth-named-day):
Doc fixes (sync from trunk 2008-04-29).
| -rw-r--r-- | lisp/calendar/calendar.el | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 0bd8a8e3e4d..dae55bf1f8b 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el | |||
| @@ -3052,12 +3052,11 @@ date d, and applying it to d+7 gives the DAYNAME following absolute date d." | |||
| 3052 | (- date (% (- date dayname) 7))) | 3052 | (- date (% (- date dayname) 7))) |
| 3053 | 3053 | ||
| 3054 | (defun calendar-nth-named-absday (n dayname month year &optional day) | 3054 | (defun calendar-nth-named-absday (n dayname month year &optional day) |
| 3055 | "The absolute date of Nth DAYNAME in MONTH, YEAR before/after optional DAY. | 3055 | "Absolute date of the Nth DAYNAME after/before MONTH YEAR DAY. |
| 3056 | A DAYNAME of 0 means Sunday, 1 means Monday, and so on. If N<0, | 3056 | A DAYNAME of 0 means Sunday, 1 means Monday, and so on. |
| 3057 | return the Nth DAYNAME before MONTH DAY, YEAR (inclusive). | ||
| 3058 | If N>0, return the Nth DAYNAME after MONTH DAY, YEAR (inclusive). | 3057 | If N>0, return the Nth DAYNAME after MONTH DAY, YEAR (inclusive). |
| 3059 | 3058 | If N<0, return the Nth DAYNAME before MONTH DAY, YEAR (inclusive). | |
| 3060 | If DAY is omitted, it defaults to 1 if N>0, and MONTH's last day otherwise." | 3059 | DAY defaults to 1 if N>0, and MONTH's last day otherwise." |
| 3061 | (if (> n 0) | 3060 | (if (> n 0) |
| 3062 | (+ (* 7 (1- n)) | 3061 | (+ (* 7 (1- n)) |
| 3063 | (calendar-dayname-on-or-before | 3062 | (calendar-dayname-on-or-before |
| @@ -3073,12 +3072,8 @@ If DAY is omitted, it defaults to 1 if N>0, and MONTH's last day otherwise." | |||
| 3073 | year)))))) | 3072 | year)))))) |
| 3074 | 3073 | ||
| 3075 | (defun calendar-nth-named-day (n dayname month year &optional day) | 3074 | (defun calendar-nth-named-day (n dayname month year &optional day) |
| 3076 | "The date of Nth DAYNAME in MONTH, YEAR before/after optional DAY. | 3075 | "Date of the Nth DAYNAME after/before MONTH YEAR DAY. |
| 3077 | A DAYNAME of 0 means Sunday, 1 means Monday, and so on. If N<0, | 3076 | Like `calendar-nth-named-absday', but returns a Gregorian date." |
| 3078 | return the Nth DAYNAME before MONTH DAY, YEAR (inclusive). | ||
| 3079 | If N>0, return the Nth DAYNAME after MONTH DAY, YEAR (inclusive). | ||
| 3080 | |||
| 3081 | If DAY is omitted, it defaults to 1 if N>0, and MONTH's last day otherwise." | ||
| 3082 | (calendar-gregorian-from-absolute | 3077 | (calendar-gregorian-from-absolute |
| 3083 | (calendar-nth-named-absday n dayname month year day))) | 3078 | (calendar-nth-named-absday n dayname month year day))) |
| 3084 | 3079 | ||