Mercurial > emacs
changeset 13675:280cee006df8
(calendar-chinese-sexagesimal-name): Renamed from
calendar-chinese-sexagisimal-name to fix misspelling.
| author | Paul Eggert <eggert@twinsun.com> |
|---|---|
| date | Thu, 30 Nov 1995 03:25:04 +0000 |
| parents | 67da41b74267 |
| children | cace0c4acd88 |
| files | lisp/calendar/cal-china.el |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calendar/cal-china.el Thu Nov 30 03:25:04 1995 +0000 +++ b/lisp/calendar/cal-china.el Thu Nov 30 03:25:04 1995 +0000 @@ -325,7 +325,7 @@ (list (list chinese-new-year (format "Chinese New Year (%s)" - (calendar-chinese-sexagisimal-name (+ y 57)))))))))) + (calendar-chinese-sexagesimal-name (+ y 57)))))))))) (defun calendar-chinese-date-string (&optional date) "String of Chinese date of Gregorian DATE. @@ -347,7 +347,7 @@ (m-cycle (% (+ (* year 5) (floor month)) 60))) (format "Cycle %s, year %s (%s), %smonth %s%s, day %s (%s)" cycle - year (calendar-chinese-sexagisimal-name year) + year (calendar-chinese-sexagesimal-name year) (if (not (integerp month)) "second " (if (< 30 (- next-month this-month)) @@ -355,13 +355,13 @@ "")) (floor month) (if (integerp month) - (format " (%s)" (calendar-chinese-sexagisimal-name + (format " (%s)" (calendar-chinese-sexagesimal-name (+ (* 5 year) month 44))) "") - day (calendar-chinese-sexagisimal-name (+ a-date 15))))) + day (calendar-chinese-sexagesimal-name (+ a-date 15))))) -(defun calendar-chinese-sexagisimal-name (n) - "The N-th name of the Chinese sexagisimal cycle. +(defun calendar-chinese-sexagesimal-name (n) + "The N-th name of the Chinese sexagesimal cycle. N congruent to 1 gives the first name, N congruent to 2 gives the second name, ..., N congruent to 60 gives the sixtieth name." (format "%s-%s"