diff options
| author | Glenn Morris <rgm@gnu.org> | 2008-04-23 02:59:47 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2008-04-23 02:59:47 +0000 |
| commit | 7717093cb56b59f41960bbc0c681ee466f27763e (patch) | |
| tree | a00c3faad6e7972b57317081d7d6e124e7d4262d /lisp/calendar/calendar.el | |
| parent | b36917033ff7aa3f851cdfa3ad1949b25ab229c4 (diff) | |
| download | emacs-7717093cb56b59f41960bbc0c681ee466f27763e.tar.gz | |
(calendar-chinese-all-holidays-flag): New.
(calendar-other-dates): Add absolute date.
Diffstat (limited to 'lisp/calendar/calendar.el')
| -rw-r--r-- | lisp/calendar/calendar.el | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 351aabcb9e7..aa7846e4090 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -792,6 +792,12 @@ calendar." :type 'boolean :group 'holidays) +(defcustom calendar-chinese-all-holidays-flag nil + "If nil, show only the major holidays from the Chinese calendar." + :version "23.1" + :type 'boolean + :group 'holidays) + ;;; End of user options. (defconst calendar-buffer "*Calendar*" @@ -1937,6 +1943,7 @@ interpreted as BC; -1 being 1 BC, and so on." (calendar-extract-month date) (calendar-extract-year date))) 2))) +;; FIXME can this be generalized for holiday-chinese? (defun calendar-nongregorian-visible-p (month day toabs fromabs switch) "Return non-nil if MONTH, DAY is visible in the calendar window. MONTH and DAY are in some non-Gregorian calendar system. The @@ -2165,6 +2172,7 @@ DATE is (month day year). Calendars that do not apply are omitted." (delq nil (list (calendar-day-of-year-string date) + (format "Absolute date: %s" (calendar-absolute-from-gregorian date)) (format "ISO date: %s" (calendar-iso-date-string date)) (format "Julian date: %s" (calendar-julian-date-string date)) |