changeset 96349:1faf76b676bf

(calendar-lunar-phases): Rename from calendar-phases-of-moon. Keep old name as alias, update callers. (lunar-phases): Rename from phases-of-moon. Keep old name as alias. (diary-lunar-phases): Rename from diary-phases-of-moon. Keep old name as alias.

--- a/lisp/calendar/lunar.el	Thu Jun 26 22:33:33 2008 +0000
+++ b/lisp/calendar/lunar.el	Fri Jun 27 00:33:29 2008 +0000
@@ -178,7 +178,7 @@
 (defvar displayed-year)
 
 ;;;###cal-autoload
-(defun calendar-phases-of-moon ()
+(defun calendar-lunar-phases ()
   "Create a buffer with the lunar phases for the current calendar window."
   (interactive)
   (message "Computing phases of the moon...")
@@ -209,9 +209,12 @@
         (lunar-phase-list m1 y1) "\n")))
     (message "Computing phases of the moon...done")))
 
-;; FIXME ?
+;;;###cal-autoload
+(define-obsolete-function-alias 'calendar-phases-of-moon
+  'calendar-lunar-phases "23.1")
+
 ;;;###autoload
-(defun phases-of-moon (&optional arg)
+(defun lunar-phases (&optional arg)
   "Display the quarters of the moon for last month, this month, and next month.
 If called with an optional prefix argument ARG, prompts for month and year.
 This function is suitable for execution in a .emacs file."
@@ -221,14 +224,17 @@
                    (calendar-current-date)))
            (displayed-month (calendar-extract-month date))
            (displayed-year (calendar-extract-year date)))
-      (calendar-phases-of-moon))))
+      (calendar-lunar-phases))))
+
+;;;###autoload
+(define-obsolete-function-alias 'phases-of-moon 'lunar-phases "23.1")
 
 (defvar date)
 
 ;; To be called from diary-list-sexp-entries, where DATE is bound.
 
 ;;;###diary-autoload
-(defun diary-phases-of-moon (&optional mark)
+(defun diary-lunar-phases (&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."
@@ -247,6 +253,10 @@
         (cons mark (concat (lunar-phase-name (nth 2 phase)) " "
                            (cadr phase))))))
 
+;;;###diary-autoload
+(define-obsolete-function-alias 'diary-phases-of-moon
+  'diary-lunar-phases "23.1")
+
 ;; 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)