aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert1995-11-30 03:25:04 +0000
committerPaul Eggert1995-11-30 03:25:04 +0000
commitba2a1fb0f2d62ce2782a0f6fe75b91b76f47e44d (patch)
tree8bc0fb293af85d0ac528949c1a512eb8d281e57c
parent2e3befbad593b907e9fc4018ec75a4c4feba3073 (diff)
downloademacs-ba2a1fb0f2d62ce2782a0f6fe75b91b76f47e44d.tar.gz
emacs-ba2a1fb0f2d62ce2782a0f6fe75b91b76f47e44d.zip
(calendar-chinese-sexagesimal-name): Renamed from
calendar-chinese-sexagisimal-name to fix misspelling.
-rw-r--r--lisp/calendar/cal-china.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el
index 242100bccf7..97a6fdac4fa 100644
--- a/lisp/calendar/cal-china.el
+++ b/lisp/calendar/cal-china.el
@@ -325,7 +325,7 @@ Gregorian date Sunday, December 31, 1 BC."
325 (list 325 (list
326 (list chinese-new-year 326 (list chinese-new-year
327 (format "Chinese New Year (%s)" 327 (format "Chinese New Year (%s)"
328 (calendar-chinese-sexagisimal-name (+ y 57)))))))))) 328 (calendar-chinese-sexagesimal-name (+ y 57))))))))))
329 329
330(defun calendar-chinese-date-string (&optional date) 330(defun calendar-chinese-date-string (&optional date)
331 "String of Chinese date of Gregorian DATE. 331 "String of Chinese date of Gregorian DATE.
@@ -347,7 +347,7 @@ Defaults to today's date if DATE is not given."
347 (m-cycle (% (+ (* year 5) (floor month)) 60))) 347 (m-cycle (% (+ (* year 5) (floor month)) 60)))
348 (format "Cycle %s, year %s (%s), %smonth %s%s, day %s (%s)" 348 (format "Cycle %s, year %s (%s), %smonth %s%s, day %s (%s)"
349 cycle 349 cycle
350 year (calendar-chinese-sexagisimal-name year) 350 year (calendar-chinese-sexagesimal-name year)
351 (if (not (integerp month)) 351 (if (not (integerp month))
352 "second " 352 "second "
353 (if (< 30 (- next-month this-month)) 353 (if (< 30 (- next-month this-month))
@@ -355,13 +355,13 @@ Defaults to today's date if DATE is not given."
355 "")) 355 ""))
356 (floor month) 356 (floor month)
357 (if (integerp month) 357 (if (integerp month)
358 (format " (%s)" (calendar-chinese-sexagisimal-name 358 (format " (%s)" (calendar-chinese-sexagesimal-name
359 (+ (* 5 year) month 44))) 359 (+ (* 5 year) month 44)))
360 "") 360 "")
361 day (calendar-chinese-sexagisimal-name (+ a-date 15))))) 361 day (calendar-chinese-sexagesimal-name (+ a-date 15)))))
362 362
363(defun calendar-chinese-sexagisimal-name (n) 363(defun calendar-chinese-sexagesimal-name (n)
364 "The N-th name of the Chinese sexagisimal cycle. 364 "The N-th name of the Chinese sexagesimal cycle.
365N congruent to 1 gives the first name, N congruent to 2 gives the second name, 365N congruent to 1 gives the first name, N congruent to 2 gives the second name,
366..., N congruent to 60 gives the sixtieth name." 366..., N congruent to 60 gives the sixtieth name."
367 (format "%s-%s" 367 (format "%s-%s"