diff options
| author | Glenn Morris | 2008-03-08 20:36:53 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-03-08 20:36:53 +0000 |
| commit | f3924c53a5dbb49b97990d305e8fe59482c694f4 (patch) | |
| tree | 37229543764f6c79ca54628e4418d8e9e3d073a3 | |
| parent | 047ec5b7bd44472f52dfaf1c4be75549026e8256 (diff) | |
| download | emacs-f3924c53a5dbb49b97990d305e8fe59482c694f4.tar.gz emacs-f3924c53a5dbb49b97990d305e8fe59482c694f4.zip | |
(phases-of-moon, lunar-new-moon-on-or-after): Doc fixes.
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/calendar/lunar.el | 10 |
2 files changed, 7 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f5f4de05570..3e0ed6ba640 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -30,16 +30,15 @@ | |||
| 30 | (french-calendar-day-name-array, french-calendar-special-days-array): | 30 | (french-calendar-day-name-array, french-calendar-special-days-array): |
| 31 | Add doc strings. | 31 | Add doc strings. |
| 32 | 32 | ||
| 33 | * calendar/cal-iso.el (calendar-iso-read-args): Doc fix. | 33 | * calendar/cal-iso.el (calendar-iso-read-args): |
| 34 | 34 | * calendar/lunar.el (phases-of-moon, lunar-new-moon-on-or-after): | |
| 35 | * calendar/cal-mayan.el (calendar-string-to-mayan-long-count) | 35 | * calendar/cal-mayan.el (calendar-string-to-mayan-long-count) |
| 36 | (calendar-mayan-haab-to-string, calendar-mayan-tzolkin-to-string) | 36 | (calendar-mayan-haab-to-string, calendar-mayan-tzolkin-to-string) |
| 37 | (calendar-read-mayan-haab-date, calendar-read-mayan-tzolkin-date) | 37 | (calendar-read-mayan-haab-date, calendar-read-mayan-tzolkin-date) |
| 38 | (calendar-next-calendar-round-date) | 38 | (calendar-next-calendar-round-date) |
| 39 | (calendar-mayan-long-count-common-era): Doc fixes. | 39 | (calendar-mayan-long-count-common-era): |
| 40 | |||
| 41 | * calendar/cal-move.el (calendar-scroll-left, calendar-scroll-right): | 40 | * calendar/cal-move.el (calendar-scroll-left, calendar-scroll-right): |
| 42 | Doc fix. | 41 | Doc fixes. |
| 43 | 42 | ||
| 44 | * calendar/cal-persia.el (persian-calendar-month-name-array) | 43 | * calendar/cal-persia.el (persian-calendar-month-name-array) |
| 45 | (persian-calendar-epoch): Make constants. | 44 | (persian-calendar-epoch): Make constants. |
diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el index 71665ddecc2..118dedfcad9 100644 --- a/lisp/calendar/lunar.el +++ b/lisp/calendar/lunar.el | |||
| @@ -224,8 +224,7 @@ remainder mod 4 gives the phase: 0 new moon, 1 first quarter, 2 full moon, | |||
| 224 | ;;;###autoload | 224 | ;;;###autoload |
| 225 | (defun phases-of-moon (&optional arg) | 225 | (defun phases-of-moon (&optional arg) |
| 226 | "Display the quarters of the moon for last month, this month, and next month. | 226 | "Display the quarters of the moon for last month, this month, and next month. |
| 227 | If called with an optional prefix argument, prompts for month and year. | 227 | If called with an optional prefix argument ARG, prompts for month and year. |
| 228 | |||
| 229 | This function is suitable for execution in a .emacs file." | 228 | This function is suitable for execution in a .emacs file." |
| 230 | (interactive "P") | 229 | (interactive "P") |
| 231 | (save-excursion | 230 | (save-excursion |
| @@ -238,7 +237,6 @@ This function is suitable for execution in a .emacs file." | |||
| 238 | 237 | ||
| 239 | (defun diary-phases-of-moon (&optional mark) | 238 | (defun diary-phases-of-moon (&optional mark) |
| 240 | "Moon phases diary entry. | 239 | "Moon phases diary entry. |
| 241 | |||
| 242 | An optional parameter MARK specifies a face or single-character string to | 240 | An optional parameter MARK specifies a face or single-character string to |
| 243 | use when highlighting the day in the calendar." | 241 | use when highlighting the day in the calendar." |
| 244 | (let* ((index (* 4 | 242 | (let* ((index (* 4 |
| @@ -256,10 +254,8 @@ use when highlighting the day in the calendar." | |||
| 256 | (cons mark (concat (lunar-phase-name (car (cdr (cdr phase)))) " " | 254 | (cons mark (concat (lunar-phase-name (car (cdr (cdr phase)))) " " |
| 257 | (car (cdr phase))))))) | 255 | (car (cdr phase))))))) |
| 258 | 256 | ||
| 259 | |||
| 260 | ;; For the Chinese calendar the calculations for the new moon need to be more | 257 | ;; For the Chinese calendar the calculations for the new moon need to be more |
| 261 | ;; accurate than those above, so we use more terms in the approximation. | 258 | ;; accurate than those above, so we use more terms in the approximation. |
| 262 | |||
| 263 | (defun lunar-new-moon-time (k) | 259 | (defun lunar-new-moon-time (k) |
| 264 | "Astronomical (Julian) day number of K th new moon." | 260 | "Astronomical (Julian) day number of K th new moon." |
| 265 | (let* ((T (/ k 1236.85)) | 261 | (let* ((T (/ k 1236.85)) |
| @@ -368,8 +364,8 @@ use when highlighting the day in the calendar." | |||
| 368 | (/ calendar-time-zone 60.0 24.0)))) | 364 | (/ calendar-time-zone 60.0 24.0)))) |
| 369 | 365 | ||
| 370 | (defun lunar-new-moon-on-or-after (d) | 366 | (defun lunar-new-moon-on-or-after (d) |
| 371 | "Astronomical (Julian) day number of first new moon on or after astronomical | 367 | "Julian day number of first new moon on or after Julian day number D. |
| 372 | \(Julian) day number d. The fractional part is the time of day. | 368 | The fractional part is the time of day. |
| 373 | 369 | ||
| 374 | The date and time are local time, including any daylight saving rules, | 370 | The date and time are local time, including any daylight saving rules, |
| 375 | as governed by the values of calendar-daylight-savings-starts, | 371 | as governed by the values of calendar-daylight-savings-starts, |