diff options
| author | Jay Belanger | 2012-11-17 21:59:00 -0600 |
|---|---|---|
| committer | Jay Belanger | 2012-11-17 21:59:00 -0600 |
| commit | eef97f35c8d8a6983e30462d16b0c01297325b94 (patch) | |
| tree | f02df0216f21ce9b584ff0834ca68c09da49d36a | |
| parent | 552a1590c6bcb0cb5d2be38c2f5ae47d9e6bf1ae (diff) | |
| download | emacs-eef97f35c8d8a6983e30462d16b0c01297325b94.tar.gz emacs-eef97f35c8d8a6983e30462d16b0c01297325b94.zip | |
* calc/calc-forms.el (math-date-to-dt): Use integer date
when calling `math-date-to-julian-dt' and 'math-date-to-gregorian-dt'.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/calc/calc-forms.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0bd5fe0a149..fdcde1dde0f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-11-18 Jay Belanger <jay.p.belanger@gmail.com> | ||
| 2 | |||
| 3 | * calc/calc-forms.el (math-date-to-dt): Use integer date when | ||
| 4 | calling `math-date-to-julian-dt' and 'math-date-to-gregorian-dt'. | ||
| 5 | |||
| 1 | 2012-11-18 Glenn Morris <rgm@gnu.org> | 6 | 2012-11-18 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * image.el (insert-image, insert-sliced-image): Doc fix. | 8 | * image.el (insert-image, insert-sliced-image): Doc fix. |
diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el index d1df20c697c..709250f9ba9 100644 --- a/lisp/calc/calc-forms.el +++ b/lisp/calc/calc-forms.el | |||
| @@ -443,8 +443,8 @@ in the Gregorian calendar and the remaining part determines the time." | |||
| 443 | (nth 3 calc-gregorian-switch) | 443 | (nth 3 calc-gregorian-switch) |
| 444 | (apply 'math-absolute-from-gregorian-dt calc-gregorian-switch)) | 444 | (apply 'math-absolute-from-gregorian-dt calc-gregorian-switch)) |
| 445 | )) | 445 | )) |
| 446 | (math-date-to-julian-dt value) | 446 | (math-date-to-julian-dt date) |
| 447 | (math-date-to-gregorian-dt value)))) | 447 | (math-date-to-gregorian-dt date)))) |
| 448 | (if (math-integerp value) | 448 | (if (math-integerp value) |
| 449 | dt | 449 | dt |
| 450 | (append dt | 450 | (append dt |