(calendar-check-holidays): Declare rather than autoloading.

(diary-show-holidays-flag): Remove unneeded declaration.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b9683e282dd41f233a288f733b5787659eb7a6c4..d6dc665939cd8d9db22abd6a734ce2d9aa7f7158 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -47,6 +47,8 @@
        (cal-menu-holidays-menu, cal-menu-goto-menu, cal-menu-scroll-menu):
        Add doc strings.
        (cal-menu-context-mouse-menu): Add some :keys.
+       (calendar-check-holidays): Declare rather than autoloading.
+       (diary-show-holidays-flag): Remove unneeded declaration.
 
        * calendar/cal-menu.el (cal-menu-moon-menu): Add sunrise/sunset.
        * calendar/calendar.el (calendar-cursor-to-date): Handle case where

diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el
index 598db79856ad57bdbc946d5d0b7f5f9418f3ce2b..704c49a650147df4863de502cb494ed73b8c428d 100644 (file)
--- a/lisp/calendar/cal-menu.el
+++ b/lisp/calendar/cal-menu.el
@@ -160,9 +160,9 @@ Signals an error if popups are unavailable."
        (x-popup-menu ,event (list ,title (append (list ,title) ,@body)))
      (error "Popup menus are not available on this system")))
 
-(autoload 'calendar-check-holidays "holidays")
 (autoload 'diary-list-entries "diary-lib")
-(defvar diary-show-holidays-flag)       ; only called from calendar.el
+;; Autoloaded in diary-lib.
+(declare-function calendar-check-holidays "holidays" (date))
 
 (defun calendar-mouse-view-diary-entries (&optional date diary event)
   "Pop up menu of diary entries for mouse-selected date.