emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r111071: * lisp/calc/calc-forms.el (m


From: Jay Belanger
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r111071: * lisp/calc/calc-forms.el (math-date-to-iso-dt): Fix weekday number.
Date: Sun, 02 Dec 2012 22:46:49 -0600
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 111071
committer: Jay Belanger <address@hidden>
branch nick: trunk
timestamp: Sun 2012-12-02 22:46:49 -0600
message:
  * lisp/calc/calc-forms.el (math-date-to-iso-dt): Fix weekday number.
modified:
  lisp/ChangeLog
  lisp/calc/calc-forms.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-03 01:08:31 +0000
+++ b/lisp/ChangeLog    2012-12-03 04:46:49 +0000
@@ -1,3 +1,7 @@
+2012-12-03  Jay Belanger  <address@hidden>
+
+       * calc/calc-forms.el (math-date-to-iso-dt): Fix weekday number.
+
 2012-12-03  Leo Liu  <address@hidden>
 
        * files.el (dir-locals-read-from-file): Check file non-empty

=== modified file 'lisp/calc/calc-forms.el'
--- a/lisp/calc/calc-forms.el   2012-12-03 01:05:08 +0000
+++ b/lisp/calc/calc-forms.el   2012-12-03 04:46:49 +0000
@@ -474,7 +474,8 @@
                      (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))


reply via email to

[Prev in Thread] Current Thread [Next in Thread]