[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calendar/cal-china.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calendar/cal-china.el,v |
Date: |
Sat, 12 Apr 2008 03:10:38 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/04/12 03:10:37
Index: cal-china.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-china.el,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- cal-china.el 11 Apr 2008 03:45:26 -0000 1.50
+++ cal-china.el 12 Apr 2008 03:10:37 -0000 1.51
@@ -60,6 +60,9 @@
:prefix "calendar-chinese-"
:group 'calendar)
+(define-obsolete-variable-alias 'chinese-calendar-time-zone
+ 'calendar-chinese-time-zone "23.1")
+
(defcustom calendar-chinese-time-zone
'(if (< year 1928)
(+ 465 (/ 40.0 60.0))
@@ -73,9 +76,12 @@
;; It gets eval'd.
;;;###autoload
(put 'calendar-chinese-time-zone 'risky-local-variable t)
+;;;###autoload
+(put 'chinese-calendar-time-zone 'risky-local-variable t)
-(define-obsolete-variable-alias 'chinese-calendar-time-zone
- 'calendar-chinese-time-zone "23.1")
+
+(define-obsolete-variable-alias 'chinese-calendar-location-name
+ 'calendar-chinese-location-name "23.1")
;; FIXME unused.
(defcustom calendar-chinese-location-name "Beijing"
@@ -83,8 +89,8 @@
:type 'string
:group 'calendar-chinese)
-(define-obsolete-variable-alias 'chinese-calendar-location-name
- 'calendar-chinese-location-name "23.1")
+(define-obsolete-variable-alias 'chinese-calendar-daylight-time-offset
+ 'calendar-chinese-daylight-time-offset "23.1")
(defcustom calendar-chinese-daylight-time-offset 0
;; The correct value is as follows, but the Chinese calendrical
@@ -95,8 +101,8 @@
:type 'integer
:group 'calendar-chinese)
-(define-obsolete-variable-alias 'chinese-calendar-daylight-time-offset
- 'calendar-chinese-daylight-time-offset "23.1")
+(define-obsolete-variable-alias 'chinese-calendar-standard-time-zone-name
+ 'calendar-chinese-standard-time-zone-name "23.1")
(defcustom calendar-chinese-standard-time-zone-name
'(if (< year 1928)
@@ -108,16 +114,16 @@
:type 'sexp
:group 'calendar-chinese)
-(define-obsolete-variable-alias 'chinese-calendar-standard-time-zone-name
- 'calendar-chinese-standard-time-zone-name "23.1")
+(define-obsolete-variable-alias 'chinese-calendar-daylight-time-zone-name
+ 'calendar-chinese-daylight-time-zone-name "23.1")
(defcustom calendar-chinese-daylight-time-zone-name "CDT"
"Abbreviated name of daylight saving time zone used for Chinese calendar."
:type 'string
:group 'calendar-chinese)
-(define-obsolete-variable-alias 'chinese-calendar-daylight-time-zone-name
- 'calendar-chinese-daylight-time-zone-name "23.1")
+(define-obsolete-variable-alias 'chinese-calendar-daylight-savings-starts
+ 'calendar-chinese-daylight-saving-start "23.1")
(defcustom calendar-chinese-daylight-saving-start nil
;; The correct value is as follows, but the Chinese calendrical
@@ -131,8 +137,8 @@
:type 'sexp
:group 'calendar-chinese)
-(define-obsolete-variable-alias 'chinese-calendar-daylight-savings-starts
- 'calendar-chinese-daylight-saving-start "23.1")
+(define-obsolete-variable-alias 'chinese-calendar-daylight-savings-ends
+ 'calendar-chinese-daylight-saving-end "23.1")
(defcustom calendar-chinese-daylight-saving-end nil
;; The correct value is as follows, but the Chinese calendrical
@@ -144,8 +150,8 @@
:type 'sexp
:group 'calendar-chinese)
-(define-obsolete-variable-alias 'chinese-calendar-daylight-savings-ends
- 'calendar-chinese-daylight-saving-end "23.1")
+(define-obsolete-variable-alias 'chinese-calendar-daylight-savings-starts-time
+ 'calendar-chinese-daylight-saving-start-time "23.1")
(defcustom calendar-chinese-daylight-saving-start-time 0
"Number of minutes after midnight that daylight saving time starts.
@@ -153,8 +159,8 @@
:type 'integer
:group 'calendar-chinese)
-(define-obsolete-variable-alias 'chinese-calendar-daylight-savings-starts-time
- 'calendar-chinese-daylight-saving-start-time "23.1")
+(define-obsolete-variable-alias 'chinese-calendar-daylight-savings-ends-time
+ 'calendar-chinese-daylight-saving-end-time "23.1")
(defcustom calendar-chinese-daylight-saving-end-time 0
"Number of minutes after midnight that daylight saving time ends.
@@ -162,8 +168,8 @@
:type 'integer
:group 'calendar-chinese)
-(define-obsolete-variable-alias 'chinese-calendar-daylight-savings-ends-time
- 'calendar-chinese-daylight-saving-end-time "23.1")
+(define-obsolete-variable-alias 'chinese-calendar-celestial-stem
+ 'calendar-chinese-celestial-stem "23.1")
(defcustom calendar-chinese-celestial-stem
["Jia" "Yi" "Bing" "Ding" "Wu" "Ji" "Geng" "Xin" "Ren" "Gui"]
@@ -180,8 +186,8 @@
(string :tag "Ren")
(string :tag "Gui")))
-(define-obsolete-variable-alias 'chinese-calendar-celestial-stem
- 'calendar-chinese-celestial-stem "23.1")
+(define-obsolete-variable-alias 'chinese-calendar-terrestrial-branch
+ 'calendar-chinese-terrestrial-branch "23.1")
(defcustom calendar-chinese-terrestrial-branch
["Zi" "Chou" "Yin" "Mao" "Chen" "Si" "Wu" "Wei" "Shen" "You" "Xu" "Hai"]
@@ -200,9 +206,6 @@
(string :tag "Xu")
(string :tag "Hai")))
-(define-obsolete-variable-alias 'chinese-calendar-terrestrial-branch
- 'calendar-chinese-terrestrial-branch "23.1")
-
;;; End of user options.
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-china.el,v, Glenn Morris, 2008/04/01
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-china.el,v, Glenn Morris, 2008/04/01
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-china.el,v, Glenn Morris, 2008/04/04
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-china.el,v, Glenn Morris, 2008/04/05
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-china.el,v, Glenn Morris, 2008/04/06
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-china.el,v, Glenn Morris, 2008/04/06
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-china.el,v, Glenn Morris, 2008/04/08
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-china.el,v, Glenn Morris, 2008/04/10
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-china.el,v,
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-china.el,v, Glenn Morris, 2008/04/22