emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/calendar/calendar.el,v


From: Glenn Morris
Subject: [Emacs-diffs] Changes to emacs/lisp/calendar/calendar.el,v
Date: Wed, 23 Apr 2008 02:59:47 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/04/23 02:59:47

Index: calendar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/calendar.el,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -b -r1.259 -r1.260
--- calendar.el 12 Apr 2008 03:11:03 -0000      1.259
+++ calendar.el 23 Apr 2008 02:59:47 -0000      1.260
@@ -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))




reply via email to

[Prev in Thread] Current Thread [Next in Thread]