summaryrefslogtreecommitdiff
path: root/lisp/calendar/cal-china.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2008-03-13 05:41:16 +0000
committerGlenn Morris <rgm@gnu.org>2008-03-13 05:41:16 +0000
commit1d0c7fdfd5b83efff68b171203893de85b0f69ac (patch)
tree54e71e95832dfab52a4daa3283494679d3a1a7bc /lisp/calendar/cal-china.el
parentdedac6ab10e26307aca17b23fa173efb1523b020 (diff)
downloademacs-1d0c7fdfd5b83efff68b171203893de85b0f69ac.tar.gz
(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.
Diffstat (limited to 'lisp/calendar/cal-china.el')
-rw-r--r--lisp/calendar/cal-china.el12
1 files changed, 5 insertions, 7 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