[Emacs-diffs] Changes to emacs/lisp/calendar/solar.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/04/07 01:59:37

Index: solar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/solar.el,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- solar.el    6 Apr 2008 20:46:37 -0000       1.80
+++ solar.el    7 Apr 2008 01:59:35 -0000       1.81
@@ -725,7 +725,7 @@
                    (/ calendar-time-zone 60.0 24.0))))
          ;; Get Ephemeris Time.
          (date (+ date (solar-ephemeris-correction
-                        (extract-calendar-year
+                        (calendar-extract-year
                          (calendar-gregorian-from-absolute
                           (floor
                            (calendar-astro-to-absolute
@@ -979,7 +979,7 @@
                         (* -0.00823 z z z)
                         (* 0.00032 z z z z)))))))
 
-(defvar displayed-month)                ; from generate-calendar
+(defvar displayed-month)                ; from calendar-generate
 (defvar displayed-year)
 
 ;;;###holiday-autoload
@@ -996,7 +996,7 @@
           (if calendar-time-zone calendar-daylight-savings-ends))
          (calendar-time-zone (if calendar-time-zone calendar-time-zone 0))
          (k (progn
-              (increment-calendar-month m y (cond ((= 1 (% m 3)) -1)
+              (calendar-increment-month m y (cond ((= 1 (% m 3)) -1)
                                                   ((= 2 (% m 3))  1)
                                                   (t              0)))
               (1- (/ m 3))))