Mercurial > emacs

changeset 92989:130c0da046a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(calendar-chinese-from-absolute, calendar-chinese-date-string): Expand calendar-mod calls.
author Glenn Morris <rgm@gnu.org>
date Sun, 16 Mar 2008 01:23:25 +0000
parents 189ca7ef805d
children 2d634b2258fb
files lisp/calendar/cal-china.el
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/calendar/cal-china.el	Sun Mar 16 01:22:58 2008 +0000
+++ b/lisp/calendar/cal-china.el	Sun Mar 16 01:23:25 2008 +0000
@@ -380,7 +380,8 @@
       ;; ...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 @@
          (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)"