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

[Glenn Morris]

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

Index: cal-mayan.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-mayan.el,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- cal-mayan.el        14 Mar 2008 07:00:49 -0000      1.37
+++ cal-mayan.el        16 Mar 2008 01:58:15 -0000      1.38
@@ -215,24 +215,22 @@
 
 (defun calendar-mayan-haab-to-string (haab)
   "Convert Mayan HAAB date (a pair) into its traditional written form."
-  (let ((month (cdr haab))
-        (day (car haab)))
+  (let ((month (cdr haab)))
+    (format "%d %s" (car haab)          ; day
     ;; 19th month consists of 5 special days
-    (if (= month 19)
-        (format "%d Uayeb" day)
-      (format "%d %s"
-              day
+            (if (= month 19) "Uayeb"
               (aref calendar-mayan-haab-month-name-array (1- month))))))
 
 (defun calendar-mayan-tzolkin-from-absolute (date)
   "Convert absolute DATE into a Mayan tzolkin date (a pair)."
   (let* ((long-count (+ date calendar-mayan-days-before-absolute-zero))
-         (day (calendar-mod
-               (+ long-count (car calendar-mayan-tzolkin-at-epoch))
-               13))
-         (name (calendar-mod
-                (+ long-count (cdr calendar-mayan-tzolkin-at-epoch))
-                20)))
+         ;; Remainder on division by 13,20 with 13,20 instead of zero.
+         (day (1+ (mod
+                   (1- (+ long-count (car calendar-mayan-tzolkin-at-epoch)))
+                   13)))
+         (name (1+ (mod
+                    (1- (+ long-count (cdr calendar-mayan-tzolkin-at-epoch)))
+                    20))))
     (cons day name)))
 
 (defun calendar-mayan-tzolkin-difference (date1 date2)