(generated-autoload-file): Don't set, instead use different values of

generate-autoload-cookie plus Makefile rules to allow for a mixture of
internal calendar autoloads and normal autoloads.

3 files changed, 17 insertions, 24 deletions

diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el
index 561a55a8a58..eecd1bc525c 100644
--- a/lisp/calendar/cal-china.el
+++ b/lisp/calendar/cal-china.el
@@ -363,6 +363,7 @@ Gregorian date Sunday, December 31, 1 BC."
           (car (car list))
           (1+ (- date (car (cdr (car list))))))))
 
+;;;###holiday-autoload
 (defun holiday-chinese-new-year ()
   "Date of Chinese New Year."
   (let ((m displayed-month)
@@ -378,7 +379,7 @@ Gregorian date Sunday, December 31, 1 BC."
                  (format "Chinese New Year (%s)"
                          (calendar-chinese-sexagesimal-name (+ y 57))))))))))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-chinese-date-string (&optional date)
   "String of Chinese date of Gregorian DATE.
 Defaults to today's date if DATE is not given."
@@ -420,7 +421,7 @@ N congruent to 1 gives the first name, N congruent to 2 gives the second name,
           (aref chinese-calendar-celestial-stem (% (1- n) 10))
           (aref chinese-calendar-terrestrial-branch (% (1- n) 12))))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-print-chinese-date ()
   "Show the Chinese date equivalents of date."
   (interactive)
@@ -428,7 +429,7 @@ N congruent to 1 gives the first name, N congruent to 2 gives the second name,
   (message "Chinese date: %s"
            (calendar-chinese-date-string (calendar-cursor-to-date t))))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-goto-chinese-date (date &optional noecho)
   "Move cursor to Chinese date DATE.
 Echo Chinese date unless NOECHO is t."
@@ -502,15 +503,12 @@ Echo Chinese date unless NOECHO is t."
 (defvar date)
 
 ;; To be called from list-sexp-diary-entries, where DATE is bound.
+;;;###diary-autoload
 (defun diary-chinese-date ()
   "Chinese calendar equivalent of date diary entry."
   (format "Chinese date: %s" (calendar-chinese-date-string date)))
 
 (provide 'cal-china)
 
-;; Local Variables:
-;; generated-autoload-file: "cal-loaddefs.el"
-;; End:
-
 ;; arch-tag: 7e5b7e0d-676c-47e3-8696-93e7ea0ab644
 ;;; cal-china.el ends here
diff --git a/lisp/calendar/cal-coptic.el b/lisp/calendar/cal-coptic.el
index 3a206d9866a..9e5664d9129 100644
--- a/lisp/calendar/cal-coptic.el
+++ b/lisp/calendar/cal-coptic.el
@@ -105,7 +105,7 @@ Gregorian date Sunday, December 31, 1 BC."
                (1- (calendar-absolute-from-coptic (list month 1 year))))))
     (list month day year))))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-coptic-date-string (&optional date)
   "String of Coptic date of Gregorian DATE.
 Returns the empty string if DATE is pre-Coptic calendar.
@@ -124,7 +124,7 @@ Defaults to today's date if DATE is not given."
             (year (int-to-string y)))
         (mapconcat 'eval calendar-date-display-form "")))))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-print-coptic-date ()
   "Show the Coptic calendar equivalent of the selected date."
   (interactive)
@@ -133,7 +133,7 @@ Defaults to today's date if DATE is not given."
         (message "Date is pre-%s calendar" coptic-name)
       (message "%s date: %s" coptic-name f))))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-goto-coptic-date (date &optional noecho)
   "Move cursor to Coptic date DATE.
 Echo Coptic date unless NOECHO is t."
@@ -170,6 +170,7 @@ Echo Coptic date unless NOECHO is t."
 (defvar date)
 
 ;; To be called from list-sexp-diary-entries, where DATE is bound.
+;;;###diary-autoload
 (defun diary-coptic-date ()
   "Coptic calendar equivalent of date diary entry."
   (let ((f (calendar-coptic-date-string date)))
@@ -201,7 +202,7 @@ Gregorian date Sunday, December 31, 1 BC."
   (let ((coptic-calendar-epoch ethiopic-calendar-epoch))
     (calendar-coptic-from-absolute date)))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-ethiopic-date-string (&optional date)
   "String of Ethiopic date of Gregorian DATE.
 Returns the empty string if DATE is pre-Ethiopic calendar.
@@ -211,7 +212,7 @@ Defaults to today's date if DATE is not given."
         (coptic-calendar-month-name-array ethiopic-calendar-month-name-array))
     (calendar-coptic-date-string date)))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-print-ethiopic-date ()
   "Show the Ethiopic calendar equivalent of the selected date."
   (interactive)
@@ -220,7 +221,7 @@ Defaults to today's date if DATE is not given."
         (coptic-calendar-month-name-array ethiopic-calendar-month-name-array))
     (call-interactively 'calendar-print-coptic-date)))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-goto-ethiopic-date (date &optional noecho)
   "Move cursor to Ethiopic date DATE.
 Echo Ethiopic date unless NOECHO is t."
@@ -234,6 +235,7 @@ Echo Ethiopic date unless NOECHO is t."
   (or noecho (calendar-print-ethiopic-date)))
 
 ;; To be called from list-sexp-diary-entries, where DATE is bound.
+;;;###diary-autoload
 (defun diary-ethiopic-date ()
   "Ethiopic calendar equivalent of date diary entry."
   (let ((coptic-calendar-epoch ethiopic-calendar-epoch)
@@ -243,9 +245,5 @@ Echo Ethiopic date unless NOECHO is t."
 
 (provide 'cal-coptic)
 
-;; Local Variables:
-;; generated-autoload-file: "cal-loaddefs.el"
-;; End:
-
 ;; arch-tag: 72d49161-25df-4072-9312-b182cdca7627
 ;;; cal-coptic.el ends here
diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el
index 4918eea045b..1284370809f 100644
--- a/lisp/calendar/cal-french.el
+++ b/lisp/calendar/cal-french.el
@@ -160,7 +160,7 @@ The absolute date is the number of days elapsed since the
                (1- (calendar-absolute-from-french (list month 1 year))))))
     (list month day year))))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-french-date-string (&optional date)
   "String of French Revolutionary date of Gregorian DATE.
 Returns the empty string if DATE is pre-French Revolutionary.
@@ -186,7 +186,7 @@ Defaults to today's date if DATE is not given."
          (aref (french-calendar-month-name-array) (1- m))
          y)))))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-print-french-date ()
   "Show the French Revolutionary calendar equivalent of the selected date."
   (interactive)
@@ -195,7 +195,7 @@ Defaults to today's date if DATE is not given."
         (message "Date is pre-French Revolution")
       (message "French Revolutionary date: %s" f))))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-goto-french-date (date &optional noecho)
   "Move cursor to French Revolutionary date DATE.
 Echo French Revolutionary date unless NOECHO is t."
@@ -250,6 +250,7 @@ Echo French Revolutionary date unless NOECHO is t."
 (defvar date)
 
 ;; To be called from list-sexp-diary-entries, where DATE is bound.
+;;;###diary-autoload
 (defun diary-french-date ()
   "French calendar equivalent of date diary entry."
   (let ((f (calendar-french-date-string date)))
@@ -259,9 +260,5 @@ Echo French Revolutionary date unless NOECHO is t."
 
 (provide 'cal-french)
 
-;; Local Variables:
-;; generated-autoload-file: "cal-loaddefs.el"
-;; End:
-
 ;; arch-tag: 7e8045a3-8609-46b5-9cde-cf40ce541cf9
 ;;; cal-french.el ends here