(displayed-year): Move declaration where needed.

(calendar-event-to-date, cal-tex-mouse-week, cal-tex-mouse-week-iso): Doc fix.
(calendar-mouse-goto-date): Move definition before use.

2 files changed, 15 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1d93d1f7f3d..8d6618a3938 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -29,6 +29,11 @@
         (french-calendar-day-name-array, french-calendar-special-days-array):
         Add doc strings.
 
+        * calendar/cal-menu.el (displayed-year): Move declaration where needed.
+        (calendar-event-to-date, cal-tex-mouse-week, cal-tex-mouse-week-iso):
+        Doc fix.
+        (calendar-mouse-goto-date): Move definition before use.
+
         * calendar/cal-persia.el (calendar-goto-persian-date): Doc fix.
 
         * calendar/diary-lib.el (mark-diary-entries): Move some constant
diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el
index fffe0b3d462..e87e4729eb3 100644
--- a/lisp/calendar/cal-menu.el
+++ b/lisp/calendar/cal-menu.el
@@ -80,8 +80,6 @@
 (declare-function calendar-print-chinese-date    "cal-china"  nil)
 (declare-function calendar-goto-date             "cal-move"   (date))
 
-(defvar displayed-year)
-
 (defconst cal-menu-moon-menu
   '("Moon"
     ["Lunar Phases" calendar-phases-of-moon]))
@@ -130,6 +128,8 @@
               (calendar-month-name (car my2) 'abbrev)
               (cdr my2)))))
 
+(defvar displayed-year)                 ; from generate-calendar
+
 (defconst cal-menu-holidays-menu
   `("Holidays"
     ["For Cursor Date -" calendar-cursor-holidays
@@ -228,12 +228,17 @@ POSITION and MENU are passed to `x-popup-menu'."
 (defun calendar-event-to-date (&optional error)
   "Date of last event.
 If event is not on a specific date, signals an error if optional parameter
-ERROR is t, otherwise just returns nil."
+ERROR is non-nil, otherwise just returns nil."
   (with-current-buffer
       (window-buffer (posn-window (event-start last-input-event)))
     (goto-char (posn-point (event-start last-input-event)))
     (calendar-cursor-to-date error)))
 
+(defun calendar-mouse-goto-date (date)
+  "Goto DATE in the buffer specified by `last-input-event'."
+  (set-buffer (window-buffer (posn-window (event-start last-input-event))))
+  (calendar-goto-date date))
+
 (defun calendar-mouse-sunrise/sunset ()
   "Show sunrise/sunset times for mouse-selected date."
   (interactive)
@@ -332,7 +337,7 @@ is non-nil."
 
 (defun cal-tex-mouse-week ()
   "One page calendar for week indicated by cursor.
-Holidays are included if `cal-tex-holidays' is t."
+Holidays are included if `cal-tex-holidays' is non-nil."
   (interactive)
   (save-excursion
     (calendar-mouse-goto-date (calendar-event-to-date))
@@ -348,7 +353,7 @@ The printed output will be on two pages."
 
 (defun cal-tex-mouse-week-iso ()
   "One page calendar for week indicated by cursor.
-Holidays are included if `cal-tex-holidays' is t."
+Holidays are included if `cal-tex-holidays' is non-nil."
   (interactive)
   (save-excursion
     (calendar-mouse-goto-date (calendar-event-to-date))
@@ -478,11 +483,6 @@ EVENT is the event that invoked this command."
     (calendar-mouse-goto-date (calendar-event-to-date))
     (calendar-print-chinese-date)))
 
-(defun calendar-mouse-goto-date (date)
-  "Goto DATE in the buffer specified by `last-input-event'."
-  (set-buffer (window-buffer (posn-window (event-start last-input-event))))
-  (calendar-goto-date date))
-
 (defun cal-menu-set-date-title (menu)
   "Convert date of last event to title suitable for MENU."
   (easy-menu-filter-return