diff options
| author | Jay Belanger | 2007-06-22 06:02:50 +0000 |
|---|---|---|
| committer | Jay Belanger | 2007-06-22 06:02:50 +0000 |
| commit | cebd3c8a27fc532514416ec9c243f0905d5337c6 (patch) | |
| tree | 64739d555d5e22b1fda668c36170765bc468e47e | |
| parent | 37b5443868e10cf346ba79c1b5f65376b09885d0 (diff) | |
| download | emacs-cebd3c8a27fc532514416ec9c243f0905d5337c6.tar.gz emacs-cebd3c8a27fc532514416ec9c243f0905d5337c6.zip | |
*** empty log message ***
| -rw-r--r-- | lisp/calc/calc-forms.el | 16 |
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 @@ | |||
| 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 "1.7214235"))))) | 564 | (math-read-number-simple "1.7214235"))))) |
| 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) |
| 568 | (eval-when-compile | 568 | (eval-when-compile |
| 569 | (math-read-number "1721424"))))) | 569 | (math-read-number-simple "1721424"))))) |
| 570 | ((eq x 'U) | 570 | ((eq x 'U) |
| 571 | (math-format-number (nth 1 (math-date-parts math-fd-date 719164)))) | 571 | (math-format-number (nth 1 (math-date-parts math-fd-date 719164)))) |
| 572 | ((progn | 572 | ((progn |
| @@ -942,9 +942,9 @@ | |||
| 942 | (if (or (eq this 'j) | 942 | (if (or (eq this 'j) |
| 943 | (math-integerp num)) | 943 | (math-integerp num)) |
| 944 | (eval-when-compile | 944 | (eval-when-compile |
| 945 | (math-read-number "1721424")) | 945 | (math-read-number-simple "1721424")) |
| 946 | (eval-when-compile | 946 | (eval-when-compile |
| 947 | (math-read-number "1.7214235"))))) | 947 | (math-read-number-simple "1.7214235"))))) |
| 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) |
| @@ -1154,19 +1154,19 @@ | |||
| 1154 | (if (math-realp date) | 1154 | (if (math-realp date) |
| 1155 | (list 'date (if (math-integerp date) | 1155 | (list 'date (if (math-integerp date) |
| 1156 | (math-sub date (eval-when-compile | 1156 | (math-sub date (eval-when-compile |
| 1157 | (math-read-number "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 "1.7214235")))) | 1160 | (math-read-number-simple "1.7214235")))) |
| 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) |
| 1164 | (math-add (nth 1 date) (if (math-integerp (nth 1 date)) | 1164 | (math-add (nth 1 date) (if (math-integerp (nth 1 date)) |
| 1165 | (eval-when-compile | 1165 | (eval-when-compile |
| 1166 | (math-read-number "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 "1.7214235")) | 1169 | (math-read-number-simple "1.7214235")) |
| 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)))) |