aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris <[email protected]>2008-03-08 20:36:53 +0000
committerGlenn Morris <[email protected]>2008-03-08 20:36:53 +0000
commitf3924c53a5dbb49b97990d305e8fe59482c694f4 (patch)
tree37229543764f6c79ca54628e4418d8e9e3d073a3 /lisp
parent047ec5b7bd44472f52dfaf1c4be75549026e8256 (diff)
(phases-of-moon, lunar-new-moon-on-or-after): Doc fixes.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/calendar/lunar.el10
2 files changed, 7 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f5f4de0557..3e0ed6ba64 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -30,16 +30,15 @@
(french-calendar-day-name-array, french-calendar-special-days-array):
Add doc strings.
- * calendar/cal-iso.el (calendar-iso-read-args): Doc fix.
-
+ * calendar/cal-iso.el (calendar-iso-read-args):
+ * calendar/lunar.el (phases-of-moon, lunar-new-moon-on-or-after):
* calendar/cal-mayan.el (calendar-string-to-mayan-long-count)
(calendar-mayan-haab-to-string, calendar-mayan-tzolkin-to-string)
(calendar-read-mayan-haab-date, calendar-read-mayan-tzolkin-date)
(calendar-next-calendar-round-date)
- (calendar-mayan-long-count-common-era): Doc fixes.
-
+ (calendar-mayan-long-count-common-era):
* calendar/cal-move.el (calendar-scroll-left, calendar-scroll-right):
- Doc fix.
+ Doc fixes.
* calendar/cal-persia.el (persian-calendar-month-name-array)
(persian-calendar-epoch): Make constants.
diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el
index 71665ddecc..118dedfcad 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,
;;;###autoload
(defun phases-of-moon (&optional arg)
"Display the quarters of the moon for last month, this month, and next month.
-If called with an optional prefix argument, prompts for month and year.
-
+If called with an optional prefix argument ARG, prompts for month and year.
This function is suitable for execution in a .emacs file."
(interactive "P")
(save-excursion
@@ -238,7 +237,6 @@ This function is suitable for execution in a .emacs file."
(defun diary-phases-of-moon (&optional mark)
"Moon phases diary entry.
-
An optional parameter MARK specifies a face or single-character string to
use when highlighting the day in the calendar."
(let* ((index (* 4
@@ -256,10 +254,8 @@ use when highlighting the day in the calendar."
(cons mark (concat (lunar-phase-name (car (cdr (cdr phase)))) " "
(car (cdr phase)))))))
-
;; For the Chinese calendar the calculations for the new moon need to be more
;; accurate than those above, so we use more terms in the approximation.
-
(defun lunar-new-moon-time (k)
"Astronomical (Julian) day number of K th new moon."
(let* ((T (/ k 1236.85))
@@ -368,8 +364,8 @@ use when highlighting the day in the calendar."
(/ calendar-time-zone 60.0 24.0))))
(defun lunar-new-moon-on-or-after (d)
- "Astronomical (Julian) day number of first new moon on or after astronomical
-\(Julian) day number d. The fractional part is the time of day.
+ "Julian day number of first new moon on or after Julian day number D.
+The fractional part is the time of day.
The date and time are local time, including any daylight saving rules,
as governed by the values of calendar-daylight-savings-starts,