Merge from emacs--rel--22

[bpt/emacs.git] / lisp / calendar / cal-china.el

diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el
index 79beef8..7f6646d 100644 (file)
--- a/lisp/calendar/cal-china.el
+++ b/lisp/calendar/cal-china.el
@@ -1,8 +1,10 @@
 ;;; cal-china.el --- calendar functions for the Chinese calendar
 
-;; Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
+;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
 ;; Human-Keywords: Chinese calendar, calendar, holidays, diary
 
@@ -41,14 +43,9 @@
 ;; ``Calendrical Calculations: The Millennium Edition'' by Edward M. Reingold
 ;; and Nachum Dershowitz, Cambridge University Press (2001).
 
-;; Comments, corrections, and improvements should be sent to
-;;  Edward M. Reingold               Department of Computer Science
-;;  (217) 333-6733                   University of Illinois at Urbana-Champaign
-;;  reingold@cs.uiuc.edu             1304 West Springfield Avenue
-;;                                   Urbana, Illinois 61801
-
 ;;; Code:
 
+(defvar date)
 (defvar displayed-month)
 (defvar displayed-year)
 
@@ -80,8 +77,8 @@ UT+7:45:40 to UT+8."
 ; The correct value is as follows, but the Chinese calendrical
 ; authorities do NOT use DST in determining astronomical events:
 ;  60
-  "*Number of minutes difference between daylight savings and standard time
-for Chinese calendar.  Default is for no daylight savings time."
+  "*Number of minutes difference between daylight saving and standard time
+for Chinese calendar.  Default is for no daylight saving time."
   :type 'integer
   :group 'chinese-calendar)
 
@@ -96,7 +93,7 @@ at 1928-01-01 00:00:00 from `PMT' to `CST'."
   :group 'chinese-calendar)
 
 (defcustom chinese-calendar-daylight-time-zone-name "CDT"
-  "*Abbreviated name of daylight-savings time zone used for Chinese calendar."
+  "*Abbreviated name of daylight saving time zone used for Chinese calendar."
   :type 'string
   :group 'chinese-calendar)
 
@@ -106,8 +103,8 @@ at 1928-01-01 00:00:00 from `PMT' to `CST'."
 ;  '(cond ((< 1986 year) (calendar-nth-named-day 1 0 4 year 10))
 ;         ((= 1986 year) '(5 4 1986))
 ;         (t nil))
-  "*Sexp giving the date on which daylight savings time starts for Chinese
-calendar.  Default is for no daylight savings time.  See documentation of
+  "*Sexp giving the date on which daylight saving time starts for Chinese
+calendar.  Default is for no daylight saving time.  See documentation of
 `calendar-daylight-savings-starts'."
   :type 'sexp
   :group 'chinese-calendar)
@@ -116,21 +113,21 @@ calendar.  Default is for no daylight savings time.  See documentation of
 ; The correct value is as follows, but the Chinese calendrical
 ; authorities do NOT use DST in determining astronomical events:
 ;  '(if (<= 1986 year) (calendar-nth-named-day 1 0 9 year 11))
-  "*Sexp giving the date on which daylight savings time ends for Chinese
-calendar.  Default is for no daylight savings time.  See documentation of
+  "*Sexp giving the date on which daylight saving time ends for Chinese
+calendar.  Default is for no daylight saving time.  See documentation of
 `calendar-daylight-savings-ends'."
   :type 'sexp
   :group 'chinese-calendar)
 
 (defcustom chinese-calendar-daylight-savings-starts-time 0
-  "*Number of minutes after midnight that daylight savings time starts for
-Chinese calendar.  Default is for no daylight savings time."
+  "*Number of minutes after midnight that daylight saving time starts for
+Chinese calendar.  Default is for no daylight saving time."
   :type 'integer
   :group 'chinese-calendar)
 
 (defcustom chinese-calendar-daylight-savings-ends-time 0
-  "*Number of minutes after midnight that daylight savings time ends for
-Chinese calendar.  Default is for no daylight savings time."
+  "*Number of minutes after midnight that daylight saving time ends for
+Chinese calendar.  Default is for no daylight saving time."
   :type 'integer
   :group 'chinese-calendar)