(date, entry, number): Move declarations to where they are needed.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 80a70f1a82582a60600605b1d3031ecc6a17c9ae..fbfa06da62f4df78995c2d52d20fd857a12c3338 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-03-10  Glenn Morris  <rgm@gnu.org>
 
+       * calendar/cal-hebrew.el (date, entry, number): Move declarations
+       to where they are needed.
+
        * calendar/calendar.el (diary-file, hebrew-holidays-1)
        (hebrew-holidays-2, hebrew-holidays-3, hebrew-holidays-4)
        (calendar, calendar-basic-setup, calendar-mode-map, calendar-set-mark)

diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el
index ecf0b9d3e77af88ab4ef874b331dfbd441afca76..284d657e9b105a4ac9def0dd58a4ca9d68e2db5c 100644 (file)
--- a/lisp/calendar/cal-hebrew.el
+++ b/lisp/calendar/cal-hebrew.el
@@ -37,11 +37,8 @@
 
 ;;; Code:
 
-(defvar date)
 (defvar displayed-month)
 (defvar displayed-year)
-(defvar entry)
-(defvar number)
 (defvar original-date)
 
 (require 'calendar)
@@ -509,6 +506,8 @@ nil if it is not visible in the current calendar window."
 (declare-function add-to-diary-list "diary-lib"
                   (date string specifier &optional marker globcolor literal))
 
+(defvar number)                                ; from diary-list-entries
+
 (defun list-hebrew-diary-entries ()
   "Add any Hebrew date entries from the diary file to `diary-entries-list'.
 Hebrew date diary entries must be prefaced by `hebrew-diary-entry-symbol'
@@ -912,6 +911,8 @@ from the cursor position."
     (display-buffer yahrzeit-buffer)
     (message "Computing Yahrzeits...done")))
 
+(defvar date)
+
 (defun diary-hebrew-date ()
   "Hebrew calendar equivalent of date diary entry."
   (format "Hebrew date (until sunset): %s" (calendar-hebrew-date-string date)))
@@ -942,6 +943,8 @@ use when highlighting the day in the calendar."
                                  (format " and %d day%s"
                                          day (if (= day 1) "" "s"))))))))))
 
+(defvar entry)
+
 (defun diary-yahrzeit (death-month death-day death-year &optional mark)
   "Yahrzeit diary entry--entry applies if date is Yahrzeit or the day before.
 Parameters are DEATH-MONTH, DEATH-DAY, DEATH-YEAR; the diary entry is assumed