2 files changed, 5 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a70411679c4..3f9fcef3295 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-09  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/calendar.el (diary-file, european-calendar-style):
+        Remove autoload cookies.
+
 2008-04-09  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * outline.el (outline-mode-menu-bar-map):
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 716215d074f..8ddab219add 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -353,7 +353,6 @@ redisplays the diary for whatever date the cursor is moved to."
   :type 'hook
   :group 'calendar-hooks)
 
-;;;###autoload
 (defcustom diary-file "~/diary"
   "Name of the file in which one's personal diary of dates is kept.
 
@@ -474,7 +473,6 @@ details, see the documentation for the variable `diary-list-entries-hook'."
 (define-obsolete-variable-alias 'bahai-diary-entry-symbol
   'diary-bahai-entry-symbol "23.1")
 
-;;;###autoload
 (defcustom european-calendar-style nil
   "Non-nil means use the European style of dates in the diary and display.
 In this case, a date like 1/2/1990 would be interpreted as
@@ -494,7 +492,6 @@ calendar package is already loaded).  Rather, use either
            (calendar-set-date-style 'american)))
   :group 'diary)
 
-;;;###autoload
 (make-obsolete-variable 'european-calendar-style 'calendar-date-style "23.1")
 
 ;; If this is autoloaded, c-d-s gets set before any customization of e-c-s.