changeset 102819:6cae903fcecf

(calendar-holidays): Don't autoload it. (Bug#2811)
author Glenn Morris <rgm@gnu.org>
date Thu, 02 Apr 2009 06:34:21 +0000
parents 076b74f811b6
children 3e7c6b40afdd
files lisp/ChangeLog lisp/calendar/holidays.el
diffstat 2 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Apr 02 06:33:18 2009 +0000
+++ b/lisp/ChangeLog	Thu Apr 02 06:34:21 2009 +0000
@@ -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
--- a/lisp/calendar/holidays.el	Thu Apr 02 06:33:18 2009 +0000
+++ b/lisp/calendar/holidays.el	Thu Apr 02 06:34:21 2009 +0000
@@ -319,7 +319,9 @@
 ;;;###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