From c97663f6bc5154ae3eb3c959c40af21ce9578a7a Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 16 Mar 2008 01:23:25 +0000 Subject: [PATCH] (calendar-chinese-from-absolute, calendar-chinese-date-string): Expand calendar-mod calls. --- lisp/calendar/cal-china.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el index f66645e918b..69aa91f2137 100644 --- a/lisp/calendar/cal-china.el +++ b/lisp/calendar/cal-china.el @@ -380,7 +380,8 @@ Gregorian date Sunday, December 31, 1 BC." ;; ...so first month on list is of no interest. (setq list (cdr list))) (list (/ (1- c-year) 60) - (calendar-mod c-year 60) + ;; Remainder of c-year/60 with 60 instead of 0. + (1+ (mod (1- c-year) 60)) (caar list) (1+ (- date (cadr (car list))))))) @@ -420,7 +421,9 @@ Defaults to today's date if DATE is not given." (next-month (calendar-absolute-from-chinese (list (if (= year 60) (1+ cycle) cycle) (if (= (floor month) 12) (1+ year) year) - (calendar-mod (1+ (floor month)) 12) + ;; Remainder of (1+(floor month))/12, with + ;; 12 instead of 0. + (1+ (mod (floor month) 12)) 1))) (m-cycle (% (+ (* year 5) (floor month)) 60))) (format "Cycle %s, year %s (%s), %smonth %s%s, day %s (%s)" -- 2.39.5