aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-03-20 04:40:18 +0000
committerGlenn Morris2008-03-20 04:40:18 +0000
commita8774f05b2dde025df92369667f157c0c46899be (patch)
tree60ddf5f3b61070601ab5d58c2cb44e1c4a72f1b7
parent06e9110e45e25b1f6b83fdc4e6d8c678c1e3020e (diff)
downloademacs-a8774f05b2dde025df92369667f157c0c46899be.tar.gz
emacs-a8774f05b2dde025df92369667f157c0c46899be.zip
(chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Make defcustoms.
-rw-r--r--lisp/calendar/cal-china.el40
1 files changed, 32 insertions, 8 deletions
diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el
index 69aa91f2137..c46f8bfc9eb 100644
--- a/lisp/calendar/cal-china.el
+++ b/lisp/calendar/cal-china.el
@@ -128,16 +128,40 @@ Default is for no daylight saving time."
128 :type 'integer 128 :type 'integer
129 :group 'chinese-calendar) 129 :group 'chinese-calendar)
130 130
131;;; End of user options. 131(defcustom chinese-calendar-celestial-stem
132
133
134(defconst chinese-calendar-celestial-stem
135 ["Jia" "Yi" "Bing" "Ding" "Wu" "Ji" "Geng" "Xin" "Ren" "Gui"] 132 ["Jia" "Yi" "Bing" "Ding" "Wu" "Ji" "Geng" "Xin" "Ren" "Gui"]
136 "Prefixes used by `calendar-chinese-sexagesimal-name'.") 133 "Prefixes used by `calendar-chinese-sexagesimal-name'."
137 134 :group 'chinese-calendar
138(defconst chinese-calendar-terrestrial-branch 135 :type '(vector (string :tag "Jia")
136 (string :tag "Yi")
137 (string :tag "Bing")
138 (string :tag "Ding")
139 (string :tag "Wu")
140 (string :tag "Ji")
141 (string :tag "Geng")
142 (string :tag "Xin")
143 (string :tag "Ren")
144 (string :tag "Gui")))
145
146(defcustom chinese-calendar-terrestrial-branch
139 ["Zi" "Chou" "Yin" "Mao" "Chen" "Si" "Wu" "Wei" "Shen" "You" "Xu" "Hai"] 147 ["Zi" "Chou" "Yin" "Mao" "Chen" "Si" "Wu" "Wei" "Shen" "You" "Xu" "Hai"]
140 "Suffixes used by `calendar-chinese-sexagesimal-name'.") 148 "Suffixes used by `calendar-chinese-sexagesimal-name'."
149 :group 'chinese-calendar
150 :type '(vector (string :tag "Zi")
151 (string :tag "Chou")
152 (string :tag "Yin")
153 (string :tag "Mao")
154 (string :tag "Chen")
155 (string :tag "Si")
156 (string :tag "Wu")
157 (string :tag "Wei")
158 (string :tag "Shen")
159 (string :tag "You")
160 (string :tag "Xu")
161 (string :tag "Hai")))
162
163;;; End of user options.
164
141 165
142(defun calendar-chinese-sexagesimal-name (n) 166(defun calendar-chinese-sexagesimal-name (n)
143 "The N-th name of the Chinese sexagesimal cycle. 167 "The N-th name of the Chinese sexagesimal cycle.