summaryrefslogtreecommitdiff
path: root/lisp/calc/calc-forms.el
diff options
context:
space:
mode:
authorJay Belanger <jay.p.belanger@gmail.com>2007-06-22 06:02:50 +0000
committerJay Belanger <jay.p.belanger@gmail.com>2007-06-22 06:02:50 +0000
commitcebd3c8a27fc532514416ec9c243f0905d5337c6 (patch)
tree64739d555d5e22b1fda668c36170765bc468e47e /lisp/calc/calc-forms.el
parent37b5443868e10cf346ba79c1b5f65376b09885d0 (diff)
downloademacs-cebd3c8a27fc532514416ec9c243f0905d5337c6.tar.gz
*** empty log message ***
Diffstat (limited to 'lisp/calc/calc-forms.el')
-rw-r--r--lisp/calc/calc-forms.el16
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el
index a0e6763a203..1752340a3c0 100644
--- a/lisp/calc/calc-forms.el
+++ b/lisp/calc/calc-forms.el
@@ -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))))