diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/calc/calc-forms.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bb14f1340df..99038a4adf9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-12-03 Jay Belanger <jay.p.belanger@gmail.com> | ||
| 2 | |||
| 3 | * calc/calc-forms.el (math-date-to-iso-dt): Fix weekday number. | ||
| 4 | |||
| 1 | 2012-12-03 Leo Liu <sdl.web@gmail.com> | 5 | 2012-12-03 Leo Liu <sdl.web@gmail.com> |
| 2 | 6 | ||
| 3 | * files.el (dir-locals-read-from-file): Check file non-empty | 7 | * 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 197bc6acee5..5ce76b14d72 100644 --- 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." | |||
| 474 | (math-sub date (math-absolute-from-iso-dt year 1 1)) | 474 | (math-sub date (math-absolute-from-iso-dt year 1 1)) |
| 475 | 7)) | 475 | 7)) |
| 476 | 1) | 476 | 1) |
| 477 | (cdr (math-idivmod date 7))))) | 477 | (let ((day (calcFunc-mod date 7))) |
| 478 | (if (= day 0) 7 day))))) | ||
| 478 | 479 | ||
| 479 | (defun math-dt-to-date (dt) | 480 | (defun math-dt-to-date (dt) |
| 480 | (or (integerp (nth 1 dt)) | 481 | (or (integerp (nth 1 dt)) |