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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/03/29 23:23:44

Index: cal-julian.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-julian.el,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- cal-julian.el       14 Mar 2008 03:34:42 -0000      1.26
+++ cal-julian.el       29 Mar 2008 23:23:44 -0000      1.27
@@ -142,27 +142,26 @@
 If MONTH, DAY (Julian) is visible, the value returned is corresponding
 Gregorian date in the form of the list (((month day year) STRING)).  Returns
 nil if it is not visible in the current calendar window."
-  (let ((m1 displayed-month)
+  (let* ((m1 displayed-month)
         (y1 displayed-year)
         (m2 displayed-month)
         (y2 displayed-year)
-        (year))
+         (start-date (progn
     (increment-calendar-month m1 y1 -1)
+                       (calendar-absolute-from-gregorian (list m1 1 y1))))
+         (end-date (progn
     (increment-calendar-month m2 y2 1)
-    (let* ((start-date (calendar-absolute-from-gregorian
-                        (list m1 1 y1)))
-           (end-date (calendar-absolute-from-gregorian
-                      (list m2 (calendar-last-day-of-month m2 y2) y2)))
+                     (calendar-absolute-from-gregorian
+                      (list m2 (calendar-last-day-of-month m2 y2) y2))))
            (julian-start (calendar-julian-from-absolute start-date))
            (julian-end (calendar-julian-from-absolute end-date))
            (julian-y1 (extract-calendar-year julian-start))
-           (julian-y2 (extract-calendar-year julian-end)))
-      (setq year (if (< 10 month) julian-y1 julian-y2))
-      (let ((date (calendar-gregorian-from-absolute
-                   (calendar-absolute-from-julian
-                    (list month day year)))))
+         (julian-y2 (extract-calendar-year julian-end))
+         (year (if (< 10 month) julian-y1 julian-y2))
+         (date (calendar-gregorian-from-absolute
+                (calendar-absolute-from-julian (list month day year)))))
         (if (calendar-date-is-visible-p date)
-            (list (list date string)))))))
+        (list (list date string)))))
 
 ;;;###cal-autoload
 (defun calendar-absolute-from-astro (d)