[Emacs-diffs] emacs/lisp ChangeLog calendar/holidays.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/04/02 06:34:24

Modified files:
        lisp           : ChangeLog 
        lisp/calendar  : holidays.el 

Log message:
        (calendar-holidays): Don't autoload it.  (Bug#2811)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15541&r2=1.15542
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/holidays.el?cvsroot=emacs&r1=1.86&r2=1.87

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15541
retrieving revision 1.15542
diff -u -b -r1.15541 -r1.15542
--- ChangeLog   2 Apr 2009 02:48:32 -0000       1.15541
+++ ChangeLog   2 Apr 2009 06:34:21 -0000       1.15542
@@ -1,3 +1,10 @@
+2009-04-02  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * international/fontset.el (setup-default-fontset): Specify

Index: calendar/holidays.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/holidays.el,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- calendar/holidays.el        10 Jan 2009 22:00:14 -0000      1.86
+++ calendar/holidays.el        2 Apr 2009 06:34:24 -0000       1.87
@@ -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