(math-format-date-part,calc-parse-standard-date,calcFunc-julian):

Fix incorrect number used in calculations.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c6ca51424bc65e25cb5e60baaf25124545cad16e..24257e1c1f3976456c307f5efff90a024a2c4a29 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-22  Jay Belanger  <jay.p.belanger@gmail.com>
+
+       * calc/calc-forms.el (math-format-date-part)
+       (calc-parse-standard-date,calcFunc-julian): Fix incorrect number
+       used in calculations.
+
 2007-06-22  Thien-Thi Nguyen  <ttn@gnuvola.org>
 
        * simple.el (next-error-recenter): New defcustom.

diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el
index 1752340a3c0384a27b827d29e31dc67e76a59889..1ffe06249bd7fa5d1413c6aec34bfef4b435ad8a 100644 (file)
--- a/lisp/calc/calc-forms.el
+++ b/lisp/calc/calc-forms.el
@@ -561,7 +561,7 @@
         (math-format-number 
           (math-add math-fd-date 
                     (eval-when-compile
-                      (math-read-number-simple "1.7214235")))))
+                      (math-read-number-simple "1721423.5")))))
        ((eq x 'j)
         (math-format-number (math-add 
                               (math-floor math-fd-date) 
@@ -944,7 +944,7 @@
                                                 (eval-when-compile
                                                   (math-read-number-simple "1721424"))
                                               (eval-when-compile
-                                                (math-read-number-simple "1.7214235")))))
+                                                (math-read-number-simple "1721423.5")))))
                            hour (or (nth 3 num) hour)
                            minute (or (nth 4 num) minute)
                            second (or (nth 5 num) second)
@@ -1157,7 +1157,7 @@
                                        (math-read-number-simple "1721424")))
                    (setq date (math-sub date 
                                          (eval-when-compile
-                                           (math-read-number-simple "1.7214235"))))
+                                           (math-read-number-simple "1721423.5"))))
                    (math-sub date (math-div (calcFunc-tzone zone date)
                                             '(float 864 2)))))
     (if (eq (car date) 'date)
@@ -1166,7 +1166,7 @@
                                      (math-read-number-simple "1721424"))
                                 (math-add  
                                   (eval-when-compile
-                                    (math-read-number-simple "1.7214235"))
+                                    (math-read-number-simple "1721423.5"))
                                           (math-div (calcFunc-tzone zone date)
                                                     '(float 864 2)))))
       (math-reject-arg date 'datep))))