Mercurial > emacs

changeset 94280:746fc66b809d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(calendar-chinese-all-holidays-flag): New. (calendar-other-dates): Add absolute date.
author Glenn Morris <rgm@gnu.org>
date Wed, 23 Apr 2008 02:59:47 +0000
parents 3a6662f0427e
children 0cbedba0ce0d
files lisp/calendar/calendar.el
diffstat 1 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/calendar/calendar.el	Wed Apr 23 02:59:15 2008 +0000
+++ b/lisp/calendar/calendar.el	Wed Apr 23 02:59:47 2008 +0000
@@ -792,6 +792,12 @@
   :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 @@
                 (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 @@
     (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))