* lisp/calc/calc-forms.el (math-date-to-iso-dt): Fix weekday number.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb14f1340dfbaf862d7994335c5fda0f401d1347..99038a4adf988b645e4cb76152edce8e7e49e9d0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-03  Jay Belanger  <jay.p.belanger@gmail.com>
+
+       * calc/calc-forms.el (math-date-to-iso-dt): Fix weekday number.
+
 2012-12-03  Leo Liu  <sdl.web@gmail.com>
 
        * files.el (dir-locals-read-from-file): Check file non-empty

diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el
index 197bc6acee564bda191a79a96cde156542d99eb9..5ce76b14d72c5817ab8bdf974bf871fbb70de009 100644 (file)
--- a/lisp/calc/calc-forms.el
+++ b/lisp/calc/calc-forms.el
@@ -474,7 +474,8 @@ in the Gregorian calendar and the remaining part determines the time."
                      (math-sub date (math-absolute-from-iso-dt year 1 1))
                      7))
                1)
-     (cdr (math-idivmod date 7)))))
+     (let ((day (calcFunc-mod date 7)))
+       (if (= day 0) 7 day)))))
 
 (defun math-dt-to-date (dt)
   (or (integerp (nth 1 dt))