Mercurial > emacs
comparison lisp/calendar/cal-china.el @ 90789:c0409ee15cee
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 670-674)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 209-210)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-185
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 21 Mar 2007 13:33:07 +0000 |
| parents | 95d0cdf160ea 3878691bdbb7 |
| children | e6fdae9180d4 |
comparison
equal
deleted
inserted
replaced
| 90788:a12805fdabe8 | 90789:c0409ee15cee |
|---|---|
| 81 | 81 |
| 82 (defcustom chinese-calendar-daylight-time-offset 0 | 82 (defcustom chinese-calendar-daylight-time-offset 0 |
| 83 ; The correct value is as follows, but the Chinese calendrical | 83 ; The correct value is as follows, but the Chinese calendrical |
| 84 ; authorities do NOT use DST in determining astronomical events: | 84 ; authorities do NOT use DST in determining astronomical events: |
| 85 ; 60 | 85 ; 60 |
| 86 "*Number of minutes difference between daylight savings and standard time | 86 "*Number of minutes difference between daylight saving and standard time |
| 87 for Chinese calendar. Default is for no daylight savings time." | 87 for Chinese calendar. Default is for no daylight saving time." |
| 88 :type 'integer | 88 :type 'integer |
| 89 :group 'chinese-calendar) | 89 :group 'chinese-calendar) |
| 90 | 90 |
| 91 (defcustom chinese-calendar-standard-time-zone-name | 91 (defcustom chinese-calendar-standard-time-zone-name |
| 92 '(if (< year 1928) | 92 '(if (< year 1928) |
| 97 at 1928-01-01 00:00:00 from `PMT' to `CST'." | 97 at 1928-01-01 00:00:00 from `PMT' to `CST'." |
| 98 :type 'sexp | 98 :type 'sexp |
| 99 :group 'chinese-calendar) | 99 :group 'chinese-calendar) |
| 100 | 100 |
| 101 (defcustom chinese-calendar-daylight-time-zone-name "CDT" | 101 (defcustom chinese-calendar-daylight-time-zone-name "CDT" |
| 102 "*Abbreviated name of daylight-savings time zone used for Chinese calendar." | 102 "*Abbreviated name of daylight saving time zone used for Chinese calendar." |
| 103 :type 'string | 103 :type 'string |
| 104 :group 'chinese-calendar) | 104 :group 'chinese-calendar) |
| 105 | 105 |
| 106 (defcustom chinese-calendar-daylight-savings-starts nil | 106 (defcustom chinese-calendar-daylight-savings-starts nil |
| 107 ; The correct value is as follows, but the Chinese calendrical | 107 ; The correct value is as follows, but the Chinese calendrical |
| 108 ; authorities do NOT use DST in determining astronomical events: | 108 ; authorities do NOT use DST in determining astronomical events: |
| 109 ; '(cond ((< 1986 year) (calendar-nth-named-day 1 0 4 year 10)) | 109 ; '(cond ((< 1986 year) (calendar-nth-named-day 1 0 4 year 10)) |
| 110 ; ((= 1986 year) '(5 4 1986)) | 110 ; ((= 1986 year) '(5 4 1986)) |
| 111 ; (t nil)) | 111 ; (t nil)) |
| 112 "*Sexp giving the date on which daylight savings time starts for Chinese | 112 "*Sexp giving the date on which daylight saving time starts for Chinese |
| 113 calendar. Default is for no daylight savings time. See documentation of | 113 calendar. Default is for no daylight saving time. See documentation of |
| 114 `calendar-daylight-savings-starts'." | 114 `calendar-daylight-savings-starts'." |
| 115 :type 'sexp | 115 :type 'sexp |
| 116 :group 'chinese-calendar) | 116 :group 'chinese-calendar) |
| 117 | 117 |
| 118 (defcustom chinese-calendar-daylight-savings-ends nil | 118 (defcustom chinese-calendar-daylight-savings-ends nil |
| 119 ; The correct value is as follows, but the Chinese calendrical | 119 ; The correct value is as follows, but the Chinese calendrical |
| 120 ; authorities do NOT use DST in determining astronomical events: | 120 ; authorities do NOT use DST in determining astronomical events: |
| 121 ; '(if (<= 1986 year) (calendar-nth-named-day 1 0 9 year 11)) | 121 ; '(if (<= 1986 year) (calendar-nth-named-day 1 0 9 year 11)) |
| 122 "*Sexp giving the date on which daylight savings time ends for Chinese | 122 "*Sexp giving the date on which daylight saving time ends for Chinese |
| 123 calendar. Default is for no daylight savings time. See documentation of | 123 calendar. Default is for no daylight saving time. See documentation of |
| 124 `calendar-daylight-savings-ends'." | 124 `calendar-daylight-savings-ends'." |
| 125 :type 'sexp | 125 :type 'sexp |
| 126 :group 'chinese-calendar) | 126 :group 'chinese-calendar) |
| 127 | 127 |
| 128 (defcustom chinese-calendar-daylight-savings-starts-time 0 | 128 (defcustom chinese-calendar-daylight-savings-starts-time 0 |
| 129 "*Number of minutes after midnight that daylight savings time starts for | 129 "*Number of minutes after midnight that daylight saving time starts for |
| 130 Chinese calendar. Default is for no daylight savings time." | 130 Chinese calendar. Default is for no daylight saving time." |
| 131 :type 'integer | 131 :type 'integer |
| 132 :group 'chinese-calendar) | 132 :group 'chinese-calendar) |
| 133 | 133 |
| 134 (defcustom chinese-calendar-daylight-savings-ends-time 0 | 134 (defcustom chinese-calendar-daylight-savings-ends-time 0 |
| 135 "*Number of minutes after midnight that daylight savings time ends for | 135 "*Number of minutes after midnight that daylight saving time ends for |
| 136 Chinese calendar. Default is for no daylight savings time." | 136 Chinese calendar. Default is for no daylight saving time." |
| 137 :type 'integer | 137 :type 'integer |
| 138 :group 'chinese-calendar) | 138 :group 'chinese-calendar) |
| 139 | 139 |
| 140 (defun chinese-zodiac-sign-on-or-after (d) | 140 (defun chinese-zodiac-sign-on-or-after (d) |
| 141 "Absolute date of first new Zodiac sign on or after absolute date d. | 141 "Absolute date of first new Zodiac sign on or after absolute date d. |