diff options
| author | Jay Belanger <jay.p.belanger@gmail.com> | 2007-06-22 05:52:29 +0000 |
|---|---|---|
| committer | Jay Belanger <jay.p.belanger@gmail.com> | 2007-06-22 05:52:29 +0000 |
| commit | e5f1224e183f937a66455d45d0a6c467a80d6e2b (patch) | |
| tree | 7812e79d703684729133b49b5fb83066e22da606 /lisp/calc | |
| parent | 4903b28a1208cc6ad9e00d250d8e670908902f27 (diff) | |
| download | emacs-e5f1224e183f937a66455d45d0a6c467a80d6e2b.tar.gz | |
(math-format-date-part,math-parse-standard-date,calcFunc-julian):
Replace math-read-number-simple by math-read-number.
Diffstat (limited to 'lisp/calc')
| -rw-r--r-- | lisp/calc/calc-forms.el | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el index 7d4065c40ee..a0e6763a203 100644 --- a/lisp/calc/calc-forms.el +++ b/lisp/calc/calc-forms.el @@ -560,11 +560,13 @@ ((eq x 'J) (math-format-number (math-add math-fd-date - (math-read-number-simple "1.7214235")))) + (eval-when-compile + (math-read-number "1.7214235"))))) ((eq x 'j) (math-format-number (math-add (math-floor math-fd-date) - (math-read-number-simple "1721424")))) + (eval-when-compile + (math-read-number "1721424"))))) ((eq x 'U) (math-format-number (nth 1 (math-date-parts math-fd-date 719164)))) ((progn @@ -939,8 +941,10 @@ 0 (if (or (eq this 'j) (math-integerp num)) - (math-read-number-simple "1721424") - (math-read-number-simple "1.7214235")))) + (eval-when-compile + (math-read-number "1721424")) + (eval-when-compile + (math-read-number "1.7214235"))))) hour (or (nth 3 num) hour) minute (or (nth 4 num) minute) second (or (nth 5 num) second) @@ -1149,15 +1153,20 @@ (defun calcFunc-julian (date &optional zone) (if (math-realp date) (list 'date (if (math-integerp date) - (math-sub date (math-read-number-simple "1721424")) + (math-sub date (eval-when-compile + (math-read-number "1721424"))) (setq date (math-sub date - (math-read-number-simple "1.7214235"))) + (eval-when-compile + (math-read-number "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)) - (math-read-number-simple "1721424") - (math-add (math-read-number-simple "1.7214235") + (eval-when-compile + (math-read-number "1721424")) + (math-add + (eval-when-compile + (math-read-number "1.7214235")) (math-div (calcFunc-tzone zone date) '(float 864 2))))) (math-reject-arg date 'datep)))) |