[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/08 04:21:13

Index: cal-julian.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-julian.el,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- cal-julian.el       8 Mar 2008 03:44:08 -0000       1.22
+++ cal-julian.el       8 Mar 2008 04:21:13 -0000       1.23
@@ -1,7 +1,7 @@
 ;;; cal-julian.el --- calendar functions for the Julian calendar
 
-;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;;   2008  Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <address@hidden>
 ;; Maintainer: Glenn Morris <address@hidden>
@@ -36,7 +36,6 @@
 
 ;;; Code:
 
-(defvar date)
 (defvar displayed-month)
 (defvar displayed-year)
 
@@ -75,7 +74,7 @@
         (day (extract-calendar-day date))
         (year (extract-calendar-year date)))
     (+ (calendar-day-number date)
-       (if (and (= (% year 100) 0)
+       (if (and (zerop (% year 100))
                 (/= (% year 400) 0)
                 (> month 2))
            1 0);; Correct for Julian but not Gregorian leap year.
@@ -164,6 +163,9 @@
         (if (calendar-date-is-visible-p date)
             (list (list date string)))))))
 
+(defvar date)
+
+;; To be called from list-sexp-diary-entries, where DATE is bound.
 (defun diary-julian-date ()
   "Julian calendar equivalent of date diary entry."
   (format "Julian date: %s" (calendar-julian-date-string date)))
@@ -209,6 +211,7 @@
      (calendar-absolute-from-astro daynumber))))
   (or noecho (calendar-print-astro-day-number)))
 
+;; To be called from list-sexp-diary-entries, where DATE is bound.
 (defun diary-astro-day-number ()
   "Astronomical (Julian) day number diary entry."
   (format "Astronomical (Julian) day number at noon UTC: %s.0"