aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Belanger2007-06-22 15:05:08 +0000
committerJay Belanger2007-06-22 15:05:08 +0000
commit092c4936336cb4cd705258471373400b060e9e46 (patch)
treea0e64f02409f2a34ac4cea6a571f70061a9710c2
parent512eb161074e4f05e68393a08a46380e149a62ad (diff)
downloademacs-092c4936336cb4cd705258471373400b060e9e46.tar.gz
emacs-092c4936336cb4cd705258471373400b060e9e46.zip
(math-format-date-part,calc-parse-standard-date,calcFunc-julian):
Fix incorrect number used in calculations.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/calc/calc-forms.el8
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c6ca51424bc..24257e1c1f3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12007-06-22 Jay Belanger <jay.p.belanger@gmail.com>
2
3 * calc/calc-forms.el (math-format-date-part)
4 (calc-parse-standard-date,calcFunc-julian): Fix incorrect number
5 used in calculations.
6
12007-06-22 Thien-Thi Nguyen <ttn@gnuvola.org> 72007-06-22 Thien-Thi Nguyen <ttn@gnuvola.org>
2 8
3 * simple.el (next-error-recenter): New defcustom. 9 * simple.el (next-error-recenter): New defcustom.
diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el
index 1752340a3c0..1ffe06249bd 100644
--- a/lisp/calc/calc-forms.el
+++ b/lisp/calc/calc-forms.el
@@ -561,7 +561,7 @@
561 (math-format-number 561 (math-format-number
562 (math-add math-fd-date 562 (math-add math-fd-date
563 (eval-when-compile 563 (eval-when-compile
564 (math-read-number-simple "1.7214235"))))) 564 (math-read-number-simple "1721423.5")))))
565 ((eq x 'j) 565 ((eq x 'j)
566 (math-format-number (math-add 566 (math-format-number (math-add
567 (math-floor math-fd-date) 567 (math-floor math-fd-date)
@@ -944,7 +944,7 @@
944 (eval-when-compile 944 (eval-when-compile
945 (math-read-number-simple "1721424")) 945 (math-read-number-simple "1721424"))
946 (eval-when-compile 946 (eval-when-compile
947 (math-read-number-simple "1.7214235"))))) 947 (math-read-number-simple "1721423.5")))))
948 hour (or (nth 3 num) hour) 948 hour (or (nth 3 num) hour)
949 minute (or (nth 4 num) minute) 949 minute (or (nth 4 num) minute)
950 second (or (nth 5 num) second) 950 second (or (nth 5 num) second)
@@ -1157,7 +1157,7 @@
1157 (math-read-number-simple "1721424"))) 1157 (math-read-number-simple "1721424")))
1158 (setq date (math-sub date 1158 (setq date (math-sub date
1159 (eval-when-compile 1159 (eval-when-compile
1160 (math-read-number-simple "1.7214235")))) 1160 (math-read-number-simple "1721423.5"))))
1161 (math-sub date (math-div (calcFunc-tzone zone date) 1161 (math-sub date (math-div (calcFunc-tzone zone date)
1162 '(float 864 2))))) 1162 '(float 864 2)))))
1163 (if (eq (car date) 'date) 1163 (if (eq (car date) 'date)
@@ -1166,7 +1166,7 @@
1166 (math-read-number-simple "1721424")) 1166 (math-read-number-simple "1721424"))
1167 (math-add 1167 (math-add
1168 (eval-when-compile 1168 (eval-when-compile
1169 (math-read-number-simple "1.7214235")) 1169 (math-read-number-simple "1721423.5"))
1170 (math-div (calcFunc-tzone zone date) 1170 (math-div (calcFunc-tzone zone date)
1171 '(float 864 2))))) 1171 '(float 864 2)))))
1172 (math-reject-arg date 'datep)))) 1172 (math-reject-arg date 'datep))))