2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d5751cf1422..5a4fcd6d0af 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-02  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/diary-lib.el (diary-cyclic): Check for +ve N.
+
+        * calendar/holidays.el (calendar-holidays):
+        Don't autoload it.  (Bug#2811)
+
 2009-04-02  Kenichi Handa  <handa@m17n.org>
 
         * international/fontset.el (setup-default-fontset): Specify
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 916a2671771..c1c38351fb1 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -319,7 +319,9 @@ See the documentation for `calendar-holidays' for details."
 ;;;###autoload
 (define-obsolete-variable-alias 'solar-holidays 'holiday-solar-holidays "23.1")
 
-;;;###autoload
+;; This one should not be autoloaded, else .emacs changes of
+;; holiday-general-holidays etc have no effect.
+;; FIXME should have some :set-after.
 (defcustom calendar-holidays
   (append holiday-general-holidays holiday-local-holidays
           holiday-other-holidays holiday-christian-holidays