[Emacs-diffs] Changes to emacs/lisp/calendar/cal-china.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/03/16 01:23:26

Index: cal-china.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-china.el,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- cal-china.el        15 Mar 2008 02:59:15 -0000      1.36
+++ cal-china.el        16 Mar 2008 01:23:25 -0000      1.37
@@ -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)"