diff options
author | Jay Belanger <jay.p.belanger@gmail.com> | 2011-03-01 21:07:34 -0600 |
---|---|---|
committer | Jay Belanger <jay.p.belanger@gmail.com> | 2011-03-01 21:07:34 -0600 |
commit | 771fc75ee915ce4cbf6f257a82e22ea49462df72 (patch) | |
tree | 41a6f99b7ec0ec91e3ad6adac304c439d811876a /lisp/calc/calc-math.el | |
parent | 0dc3e4109e0c41bbf5fdcae0ff1156162719693e (diff) | |
download | emacs-771fc75ee915ce4cbf6f257a82e22ea49462df72.tar.gz emacs-771fc75ee915ce4cbf6f257a82e22ea49462df72.tar.bz2 emacs-771fc75ee915ce4cbf6f257a82e22ea49462df72.zip |
* calc/calc-math.el (calcFunc-log10): Check for symbolic mode
when evaluating.
* calc/calc-units.el (math-conditional-apply, math-conditional-pow):
New function.
(math-logunits-add, math-logunits-mul, math-logunits-divide):
(math-logunits-quant, math-logunits-level): Use
`math-conditional-apply' and `math-conditional-pow' to evaluate
functions.
(math-logunits-level): Extract units from ratio.
Diffstat (limited to 'lisp/calc/calc-math.el')
-rw-r--r-- | lisp/calc/calc-math.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/calc/calc-math.el b/lisp/calc/calc-math.el index 92af9263b28..076dab31fd9 100644 --- a/lisp/calc/calc-math.el +++ b/lisp/calc/calc-math.el @@ -1574,7 +1574,7 @@ If this can't be done, return NIL." (if calc-infinite-mode '(neg (var inf var-inf)) (math-reject-arg x "*Logarithm of zero"))) - ;;(calc-symbolic-mode (signal 'inexact-result nil)) + (calc-symbolic-mode (signal 'inexact-result nil)) ((Math-numberp x) (math-with-extra-prec 2 (let ((xf (math-float x))) |