(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.

diff --git a/lisp/calendar/cal-mayan.el b/lisp/calendar/cal-mayan.el
index 8efb5c2581aef82f2d89afe13c8db05a2d0be1f5..6cea9545898781701e1af49b47fe0d47e19762c5 100644 (file)
--- a/lisp/calendar/cal-mayan.el
+++ b/lisp/calendar/cal-mayan.el
@@ -136,7 +136,7 @@ but some use 1137140.  Using 1232041 gives you Spinden's correlation; using
            (calendar-mayan-haab-from-absolute 0) haab-date))
        365)))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-next-haab-date (haab-date &optional noecho)
   "Move cursor to next instance of Mayan HAAB-DATE.
 Echo Mayan date if NOECHO is t."
@@ -149,7 +149,7 @@ Echo Mayan date if NOECHO is t."
         (calendar-absolute-from-gregorian (calendar-cursor-to-date))))))
   (or noecho (calendar-print-mayan-date)))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-previous-haab-date (haab-date &optional noecho)
   "Move cursor to previous instance of Mayan HAAB-DATE.
 Echo Mayan date if NOECHO is t."
@@ -200,7 +200,7 @@ Echo Mayan date if NOECHO is t."
                 tzolkin-date))
        260)))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-next-tzolkin-date (tzolkin-date &optional noecho)
   "Move cursor to next instance of Mayan TZOLKIN-DATE.
 Echo Mayan date if NOECHO is t."
@@ -213,7 +213,7 @@ Echo Mayan date if NOECHO is t."
         (calendar-absolute-from-gregorian (calendar-cursor-to-date))))))
   (or noecho (calendar-print-mayan-date)))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-previous-tzolkin-date (tzolkin-date &optional noecho)
   "Move cursor to previous instance of Mayan TZOLKIN-DATE.
 Echo Mayan date if NOECHO is t."
@@ -282,7 +282,7 @@ Returns nil if such a tzolkin-haab combination is impossible."
                          (calendar-make-alist tzolkin-name-list 1) t))))
     (cons tzolkin-count tzolkin-name)))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-next-calendar-round-date (tzolkin-date haab-date
                                                        &optional noecho)
   "Move cursor to next instance of Mayan TZOLKIN-DATE HAAB-DATE combination.
@@ -300,7 +300,7 @@ Echo Mayan date unless NOECHO is non-nil."
       (calendar-goto-date (calendar-gregorian-from-absolute date))
       (or noecho (calendar-print-mayan-date)))))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-previous-calendar-round-date
   (tzolkin-date haab-date &optional noecho)
   "Move to previous instance of Mayan TZOLKIN-DATE HAAB-DATE combination.
@@ -329,7 +329,7 @@ Long count is a list (baktun katun tun uinal kin)"
      (-                          ; days before absolute date 0
       calendar-mayan-days-before-absolute-zero)))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-mayan-date-string (&optional date)
   "String of Mayan date of Gregorian DATE.
 Defaults to today's date if DATE is not given."
@@ -343,14 +343,14 @@ Defaults to today's date if DATE is not given."
               (calendar-mayan-tzolkin-to-string tzolkin)
               (calendar-mayan-haab-to-string haab))))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-print-mayan-date ()
   "Show the Mayan long count, tzolkin, and haab equivalents of date."
   (interactive)
   (message "Mayan date: %s"
            (calendar-mayan-date-string (calendar-cursor-to-date t))))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-goto-mayan-long-count-date (date &optional noecho)
   "Move cursor to Mayan long count DATE.  Echo Mayan date unless NOECHO is t."
   (interactive
@@ -382,15 +382,12 @@ Defaults to today's date if DATE is not given."
 (defvar date)
 
 ;; To be called from list-sexp-diary-entries, where DATE is bound.
+;;;###diary-autoload
 (defun diary-mayan-date ()
   "Show the Mayan long count, haab, and tzolkin dates as a diary entry."
   (format "Mayan date: %s" (calendar-mayan-date-string date)))
 
 (provide 'cal-mayan)
 
-;; Local Variables:
-;; generated-autoload-file: "cal-loaddefs.el"
-;; End:
-
 ;; arch-tag: 54f35144-cd0f-4873-935a-a60129de07df
 ;;; cal-mayan.el ends here

diff --git a/lisp/calendar/cal-move.el b/lisp/calendar/cal-move.el
index ec01ef9ca2181767931cd5c4a3bdc03d2b9bbf34..e28542b7c21489b0612923ad74c0a29809fe86c3 100644 (file)
--- a/lisp/calendar/cal-move.el
+++ b/lisp/calendar/cal-move.el
@@ -37,7 +37,7 @@
 
 (require 'calendar)
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-goto-today ()
   "Reposition the calendar window so the current date is visible."
   (interactive)
@@ -48,7 +48,7 @@
       (calendar-cursor-to-visible-date today)))
   (run-hooks 'calendar-move-hook))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-forward-month (arg)
   "Move the cursor forward ARG months.
 Movement is backward if ARG is negative."
@@ -69,28 +69,28 @@ Movement is backward if ARG is negative."
       (calendar-cursor-to-visible-date new-cursor-date)))
   (run-hooks 'calendar-move-hook))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-forward-year (arg)
   "Move the cursor forward by ARG years.
 Movement is backward if ARG is negative."
   (interactive "p")
   (calendar-forward-month (* 12 arg)))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-backward-month (arg)
   "Move the cursor backward by ARG months.
 Movement is forward if ARG is negative."
   (interactive "p")
   (calendar-forward-month (- arg)))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-backward-year (arg)
   "Move the cursor backward ARG years.
 Movement is forward is ARG is negative."
   (interactive "p")
   (calendar-forward-month (* -12 arg)))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-scroll-left (&optional arg event)
   "Scroll the displayed calendar left by ARG months.
 If ARG is negative the calendar is scrolled right.  Maintains the relative
@@ -116,7 +116,7 @@ EVENT is an event like `last-nonmenu-event'."
               (t (list month 1 year)))))))
     (run-hooks 'calendar-move-hook)))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-scroll-right (&optional arg event)
   "Scroll the displayed calendar window right by ARG months.
 If ARG is negative the calendar is scrolled left.  Maintains the relative
@@ -126,7 +126,7 @@ EVENT is an event like `last-nonmenu-event'."
                      last-nonmenu-event))
   (calendar-scroll-left (- (or arg 1)) event))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-scroll-left-three-months (arg)
   "Scroll the displayed calendar window left by 3*ARG months.
 If ARG is negative the calendar is scrolled right.  Maintains the relative
@@ -134,7 +134,7 @@ position of the cursor with respect to the calendar as well as possible."
   (interactive "p")
   (calendar-scroll-left (* 3 arg)))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-scroll-right-three-months (arg)
   "Scroll the displayed calendar window right by 3*ARG months.
 If ARG is negative the calendar is scrolled left.  Maintains the relative
@@ -142,7 +142,7 @@ position of the cursor with respect to the calendar as well as possible."
   (interactive "p")
   (calendar-scroll-left (* -3 arg)))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-cursor-to-nearest-date ()
   "Move the cursor to the closest date.
 The position of the cursor is unchanged if it is already on a date.
@@ -168,7 +168,7 @@ Returns the list (month day year) giving the cursor position."
             (re-search-backward "[0-9]" nil t)))
       (calendar-cursor-to-date))))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-forward-day (arg)
   "Move the cursor forward ARG days.
 Moves backward if ARG is negative."
@@ -191,28 +191,28 @@ Moves backward if ARG is negative."
         (calendar-cursor-to-visible-date new-cursor-date)))
   (run-hooks 'calendar-move-hook))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-backward-day (arg)
   "Move the cursor back ARG days.
 Moves forward if ARG is negative."
   (interactive "p")
   (calendar-forward-day (- arg)))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-forward-week (arg)
   "Move the cursor forward ARG weeks.
 Moves backward if ARG is negative."
   (interactive "p")
   (calendar-forward-day (* arg 7)))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-backward-week (arg)
   "Move the cursor back ARG weeks.
 Moves forward if ARG is negative."
   (interactive "p")
   (calendar-forward-day (* arg -7)))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-beginning-of-week (arg)
   "Move the cursor back ARG calendar-week-start-day's."
   (interactive "p")
@@ -224,7 +224,7 @@ Moves forward if ARG is negative."
        (+ (mod (- day calendar-week-start-day) 7)
           (* 7 (1- arg)))))))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-end-of-week (arg)
   "Move the cursor forward ARG calendar-week-start-day+6's."
   (interactive "p")
@@ -236,7 +236,7 @@ Moves forward if ARG is negative."
        (+ (- 6 (mod (- day calendar-week-start-day) 7))
           (* 7 (1- arg)))))))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-beginning-of-month (arg)
   "Move the cursor backward ARG month beginnings."
   (interactive "p")
@@ -250,7 +250,7 @@ Moves forward if ARG is negative."
       (calendar-cursor-to-visible-date (list month 1 year))
       (calendar-backward-month (1- arg)))))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-end-of-month (arg)
   "Move the cursor forward ARG month ends."
   (interactive "p")
@@ -274,7 +274,7 @@ Moves forward if ARG is negative."
       (calendar-cursor-to-visible-date last-day))))
   (run-hooks 'calendar-move-hook))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-beginning-of-year (arg)
   "Move the cursor backward ARG year beginnings."
   (interactive "p")
@@ -294,7 +294,7 @@ Moves forward if ARG is negative."
         (calendar-cursor-to-visible-date (list 1 1 displayed-year)))))
   (run-hooks 'calendar-move-hook))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-end-of-year (arg)
   "Move the cursor forward ARG year beginnings."
   (interactive "p")
@@ -314,7 +314,7 @@ Moves forward if ARG is negative."
         (calendar-cursor-to-visible-date (list 12 31 displayed-year)))))
   (run-hooks 'calendar-move-hook))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-cursor-to-visible-date (date)
   "Move the cursor to DATE that is on the screen."
   (let* ((month (extract-calendar-month date))
@@ -336,7 +336,7 @@ Moves forward if ARG is negative."
                              (- (calendar-day-of-week date)
                                 calendar-week-start-day)
                              7))))))
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-goto-date (date)
   "Move cursor to DATE."
   (interactive (list (calendar-read-date)))
@@ -351,7 +351,7 @@ Moves forward if ARG is negative."
   (calendar-cursor-to-visible-date date)
   (run-hooks 'calendar-move-hook))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-goto-day-of-year (year day &optional noecho)
   "Move cursor to YEAR, DAY number; echo DAY/YEAR unless NOECHO is t.
 Negative DAY counts backward from end of year."
@@ -385,9 +385,5 @@ Negative DAY counts backward from end of year."
 
 (provide 'cal-move)
 
-;; Local Variables:
-;; generated-autoload-file: "cal-loaddefs.el"
-;; End:
-
 ;; arch-tag: d0883c46-7e16-4914-8ff8-8f67e699b781
 ;;; cal-move.el ends here

diff --git a/lisp/calendar/cal-persia.el b/lisp/calendar/cal-persia.el
index 24be5b557ee15b92975945aac32f9cacd8896b71..9861dc22910605c508c6615493bd3cdb23a051e9 100644 (file)
--- a/lisp/calendar/cal-persia.el
+++ b/lisp/calendar/cal-persia.el
@@ -137,7 +137,7 @@ Gregorian date Sunday, December 31, 1 BC."
                        (list month 1 year))))))
     (list month day year)))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-persian-date-string (&optional date)
   "String of Persian date of Gregorian DATE, default today."
   (let* ((persian-date (calendar-persian-from-absolute
@@ -152,14 +152,14 @@ Gregorian date Sunday, December 31, 1 BC."
           (year (int-to-string y)))
       (mapconcat 'eval calendar-date-display-form ""))))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-print-persian-date ()
   "Show the Persian calendar equivalent of the selected date."
   (interactive)
   (message "Persian date: %s"
            (calendar-persian-date-string (calendar-cursor-to-date t))))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-goto-persian-date (date &optional noecho)
   "Move cursor to Persian date DATE.
 Echo Persian date unless NOECHO is t."
@@ -196,15 +196,12 @@ Echo Persian date unless NOECHO is t."
 (defvar date)
 
 ;; To be called from list-sexp-diary-entries, where DATE is bound.
+;;;###diary-autoload
 (defun diary-persian-date ()
   "Persian calendar equivalent of date diary entry."
   (format "Persian date: %s" (calendar-persian-date-string date)))
 
 (provide 'cal-persia)
 
-;; Local Variables:
-;; generated-autoload-file: "cal-loaddefs.el"
-;; End:
-
 ;; arch-tag: 2832383c-e4b4-4dc2-8ee9-cfbdd53e5e2d
 ;;; cal-persia.el ends here