diff options
| author | Jay Belanger <jay.p.belanger@gmail.com> | 2012-12-02 22:46:49 -0600 |
|---|---|---|
| committer | Jay Belanger <jay.p.belanger@gmail.com> | 2012-12-02 22:46:49 -0600 |
| commit | 77a7493589dd3c54cdcb96aeb6fa8b2bac485f09 (patch) | |
| tree | b25d968c950769521f3789872f9603044fa017d8 | |
| parent | c5bc2d1d0558bbaa29ef04f9bd7bef50146382ab (diff) | |
| download | emacs-77a7493589dd3c54cdcb96aeb6fa8b2bac485f09.tar.gz | |
* lisp/calc/calc-forms.el (math-date-to-iso-dt): Fix weekday number.
| -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 @@ +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 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." (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)) |