[Emacs-diffs] Changes to emacs/lisp/calc/calc-forms.el,v

[Jay Belanger]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jay Belanger <jpb>      07/06/22 06:02:50

Index: calc-forms.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calc/calc-forms.el,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- calc-forms.el       22 Jun 2007 05:52:29 -0000      1.25
+++ calc-forms.el       22 Jun 2007 06:02:50 -0000      1.26
@@ -561,12 +561,12 @@
         (math-format-number 
           (math-add math-fd-date 
                     (eval-when-compile
-                      (math-read-number "1.7214235")))))
+                      (math-read-number-simple "1.7214235")))))
        ((eq x 'j)
         (math-format-number (math-add 
                               (math-floor math-fd-date) 
                               (eval-when-compile
-                                (math-read-number "1721424")))))
+                                (math-read-number-simple "1721424")))))
        ((eq x 'U)
         (math-format-number (nth 1 (math-date-parts math-fd-date 719164))))
        ((progn
@@ -942,9 +942,9 @@
                                            (if (or (eq this 'j)
                                                    (math-integerp num))
                                                 (eval-when-compile
-                                                  (math-read-number "1721424"))
+                                                  (math-read-number-simple 
"1721424"))
                                               (eval-when-compile
-                                                (math-read-number 
"1.7214235")))))
+                                                (math-read-number-simple 
"1.7214235")))))
                            hour (or (nth 3 num) hour)
                            minute (or (nth 4 num) minute)
                            second (or (nth 5 num) second)
@@ -1154,19 +1154,19 @@
   (if (math-realp date)
       (list 'date (if (math-integerp date)
                      (math-sub date (eval-when-compile
-                                       (math-read-number "1721424")))
+                                       (math-read-number-simple "1721424")))
                    (setq date (math-sub date 
                                          (eval-when-compile
-                                           (math-read-number "1.7214235"))))
+                                           (math-read-number-simple 
"1.7214235"))))
                    (math-sub date (math-div (calcFunc-tzone zone date)
                                             '(float 864 2)))))
     (if (eq (car date) 'date)
        (math-add (nth 1 date) (if (math-integerp (nth 1 date))
                                    (eval-when-compile
-                                     (math-read-number "1721424"))
+                                     (math-read-number-simple "1721424"))
                                 (math-add  
                                   (eval-when-compile
-                                    (math-read-number "1.7214235"))
+                                    (math-read-number-simple "1.7214235"))
                                           (math-div (calcFunc-tzone zone date)
                                                     '(float 864 2)))))
       (math-reject-arg date 'datep))))