diff options
author | Jay Belanger <jay.p.belanger@gmail.com> | 2005-02-19 15:59:53 +0000 |
---|---|---|
committer | Jay Belanger <jay.p.belanger@gmail.com> | 2005-02-19 15:59:53 +0000 |
commit | eb1ef4557d6d591d6d81dc236e58ce84849cbada (patch) | |
tree | ce2a33c0678f5a3e5eddcc0fcad4445d3d056211 /lisp/calc | |
parent | 0e0d5683812fe9d4b77355291e9efd8ed8873d64 (diff) | |
download | emacs-eb1ef4557d6d591d6d81dc236e58ce84849cbada.tar.gz |
(calc-arctan, calc-tanh, calc-arctanh): Removed extra definitions.
(calc-coth): New function.
(calcFunc-cot): Fix `let'.
Diffstat (limited to 'lisp/calc')
-rw-r--r-- | lisp/calc/calc-math.el | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/lisp/calc/calc-math.el b/lisp/calc/calc-math.el index d2c66c34d49..ffb7644cdfe 100644 --- a/lisp/calc/calc-math.el +++ b/lisp/calc/calc-math.el @@ -236,21 +236,10 @@ (calc-unary-op "coth" 'calcFunc-coth arg) (calc-unary-op "cot" 'calcFunc-cot arg)))) -(defun calc-arctan (arg) - (interactive "P") - (calc-invert-func) - (calc-tan arg)) - -(defun calc-tanh (arg) +(defun calc-coth (arg) (interactive "P") (calc-hyperbolic-func) - (calc-tan arg)) - -(defun calc-arctanh (arg) - (interactive "P") - (calc-invert-func) - (calc-hyperbolic-func) - (calc-tan arg)) + (calc-cot arg)) (defun calc-arctan2 () (interactive) @@ -991,11 +980,11 @@ (or (math-with-extra-prec 2 (let* ((xx (math-to-radians (math-float x))) (na (math-floor (math-div (nth 2 xx) (math-pi)))) - (nb (math-floor (math-div (nth 3 xx) (math-pi)))) + (nb (math-floor (math-div (nth 3 xx) (math-pi))))) (and (equal na nb) (math-sort-intv (nth 1 x) (math-cot-raw (nth 2 xx)) - (math-cot-raw (nth 3 xx))))))) + (math-cot-raw (nth 3 xx)))))) '(intv 3 (neg (var inf var-inf)) (var inf var-inf)))) ((equal x '(var nan var-nan)) x) |