From 9e85002daced7ba2abd85bcb526e7e80847e5464 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 13 Mar 2008 05:44:04 +0000 Subject: [PATCH] (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. --- lisp/calendar/cal-islam.el | 21 +++++++++++---------- lisp/calendar/cal-iso.el | 13 +++++-------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/lisp/calendar/cal-islam.el b/lisp/calendar/cal-islam.el index 13bc0c8e339..6c915e2b8cf 100644 --- a/lisp/calendar/cal-islam.el +++ b/lisp/calendar/cal-islam.el @@ -117,7 +117,7 @@ Gregorian date Sunday, December 31, 1 BC." (1- (calendar-absolute-from-islamic (list month 1 year)))))) (list month day year)))) -;;;###autoload +;;;###cal-autoload (defun calendar-islamic-date-string (&optional date) "String of Islamic date before sunset of Gregorian DATE. Returns the empty string if DATE is pre-Islamic. @@ -131,7 +131,7 @@ Driven by the variable `calendar-date-display-form'." "" (calendar-date-string islamic-date nil t)))) -;;;###autoload +;;;###cal-autoload (defun calendar-print-islamic-date () "Show the Islamic calendar equivalent of the date under the cursor." (interactive) @@ -140,7 +140,7 @@ Driven by the variable `calendar-date-display-form'." (message "Date is pre-Islamic") (message "Islamic date (until sunset): %s" i)))) -;;;###autoload +;;;###cal-autoload (defun calendar-goto-islamic-date (date &optional noecho) "Move cursor to Islamic DATE; echo Islamic date unless NOECHO is t." (interactive @@ -169,6 +169,7 @@ Driven by the variable `calendar-date-display-form'." (calendar-absolute-from-islamic date))) (or noecho (calendar-print-islamic-date))) +;;;###holiday-autoload (defun holiday-islamic (month day string) "Holiday on MONTH, DAY (Islamic) called STRING. If MONTH, DAY (Islamic) is visible, the value returned is corresponding @@ -195,6 +196,7 @@ nil if it is not visible in the current calendar window." (defvar number) ; from diary-list-entries +;;;###diary-autoload (defun list-islamic-diary-entries () "Add any Islamic date entries from the diary file to `diary-entries-list'. Islamic date diary entries must be prefaced by `islamic-diary-entry-symbol' @@ -288,6 +290,7 @@ marked in the calendar. This function is provided for use with (declare-function mark-calendar-days-named "diary-lib" (dayname &optional color)) +;;;###diary-autoload (defun mark-islamic-diary-entries () "Mark days in the calendar window that have Islamic date diary entries. Each entry in `diary-file' (or included files) visible in the calendar window @@ -391,6 +394,7 @@ provided for use as part of the `nongregorian-diary-marking-hook'." (mark-islamic-calendar-date-pattern mm dd yy))))) (setq d (cdr d))))) +;;;###diary-autoload (defun mark-islamic-calendar-date-pattern (month day year) "Mark dates in calendar window that conform to Islamic date MONTH/DAY/YEAR. A value of 0 in any position is a wildcard." @@ -449,7 +453,7 @@ A value of 0 in any position is a wildcard." (mark-visible-calendar-date (calendar-gregorian-from-absolute date))))))))) -;;;###autoload +;;;###cal-autoload (defun insert-islamic-diary-entry (arg) "Insert a diary entry. For the Islamic date corresponding to the date indicated by point. @@ -466,7 +470,7 @@ Prefix argument ARG makes the entry nonmarking." nil t)) arg))) -;;;###autoload +;;;###cal-autoload (defun insert-monthly-islamic-diary-entry (arg) "Insert a monthly diary entry. For the day of the Islamic month corresponding to the date indicated by point. @@ -484,7 +488,7 @@ Prefix argument ARG makes the entry nonmarking." (calendar-cursor-to-date t))))) arg))) -;;;###autoload +;;;###cal-autoload (defun insert-yearly-islamic-diary-entry (arg) "Insert an annual diary entry. For the day of the Islamic year corresponding to the date indicated by point. @@ -507,6 +511,7 @@ Prefix argument ARG makes the entry nonmarking." (defvar date) ;; To be called from diary-sexp-entry, where DATE, ENTRY are bound. +;;;###diary-autoload (defun diary-islamic-date () "Islamic calendar equivalent of date diary entry." (let ((i (calendar-islamic-date-string date))) @@ -516,9 +521,5 @@ Prefix argument ARG makes the entry nonmarking." (provide 'cal-islam) -;; Local Variables: -;; generated-autoload-file: "cal-loaddefs.el" -;; End: - ;; arch-tag: a951b6c1-6f47-48d5-bac3-1b505cd719f7 ;;; cal-islam.el ends here diff --git a/lisp/calendar/cal-iso.el b/lisp/calendar/cal-iso.el index 9a79efd4ffc..65b1debb672 100644 --- a/lisp/calendar/cal-iso.el +++ b/lisp/calendar/cal-iso.el @@ -74,7 +74,7 @@ date Sunday, December 31, 1 BC." (% date 7) year))) -;;;###autoload +;;;###cal-autoload (defun calendar-iso-date-string (&optional date) "String of ISO date of Gregorian DATE, default today." (let* ((d (calendar-absolute-from-gregorian @@ -86,7 +86,7 @@ date Sunday, December 31, 1 BC." (extract-calendar-month iso-date) (extract-calendar-year iso-date)))) -;;;###autoload +;;;###cal-autoload (defun calendar-print-iso-date () "Show equivalent ISO date for the date under the cursor." (interactive) @@ -117,7 +117,7 @@ taken to be 1)." 1))) (list (list week day year)))) -;;;###autoload +;;;###cal-autoload (defun calendar-goto-iso-date (date &optional noecho) "Move cursor to ISO DATE; echo ISO date unless NOECHO is non-nil." (interactive (calendar-iso-read-args t)) @@ -125,7 +125,7 @@ taken to be 1)." (calendar-absolute-from-iso date))) (or noecho (calendar-print-iso-date))) -;;;###autoload +;;;###cal-autoload (defun calendar-goto-iso-week (date &optional noecho) "Move cursor to ISO DATE; echo ISO date unless NOECHO is non-nil. Interactively, goes to the first day of the specified week." @@ -137,15 +137,12 @@ Interactively, goes to the first day of the specified week." (defvar date) ;; To be called from list-sexp-diary-entries, where DATE is bound. +;;;###diary-autoload (defun diary-iso-date () "ISO calendar equivalent of date diary entry." (format "ISO date: %s" (calendar-iso-date-string date))) (provide 'cal-iso) -;; Local Variables: -;; generated-autoload-file: "cal-loaddefs.el" -;; End: - ;; arch-tag: 3c0154cc-d30f-4981-9f60-42bdf7a468f6 ;;; cal-iso.el ends here -- 2.39.2