summaryrefslogtreecommitdiff
path: root/lisp/calc
diff options
context:
space:
mode:
authorJay Belanger <jay.p.belanger@gmail.com>2011-02-26 19:33:37 -0600
committerJay Belanger <jay.p.belanger@gmail.com>2011-02-26 19:33:37 -0600
commitb49df7426b4647433b2309c4f320133e4ce37009 (patch)
tree8ef508290e8111cdd506f5f838f10655be47d0db /lisp/calc
parente573299d40e5825584ed9e8bd58f5a8c2deee6fd (diff)
downloademacs-b49df7426b4647433b2309c4f320133e4ce37009.tar.gz
* calc/calc-ext.el (calc-init-extensions): Autoload `calc-l-prefix-help'
instead of `calc-ul-prefix-help'. * calc/calc-math.el (calcFunc-log10): Don't signal an error in symbolic mode. * calc/calc-vec.el (calcFunc-subscr): Don't do anything if the first argument is a variable.
Diffstat (limited to 'lisp/calc')
-rw-r--r--lisp/calc/calc-ext.el2
-rw-r--r--lisp/calc/calc-math.el2
-rw-r--r--lisp/calc/calc-vec.el1
3 files changed, 3 insertions, 2 deletions
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index fcc3ecc1ab1..ec4e902f33d 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -1061,7 +1061,7 @@ calc-full-help calc-g-prefix-help calc-help-prefix
calc-hyperbolic-prefix-help calc-inv-hyp-prefix-help calc-option-prefix-help
calc-inverse-prefix-help calc-j-prefix-help calc-k-prefix-help
calc-m-prefix-help calc-r-prefix-help calc-s-prefix-help
-calc-t-prefix-help calc-u-prefix-help calc-ul-prefix-help
+calc-t-prefix-help calc-u-prefix-help calc-l-prefix-help
calc-v-prefix-help)
("calc-incom" calc-begin-complex calc-begin-vector calc-comma
diff --git a/lisp/calc/calc-math.el b/lisp/calc/calc-math.el
index 185ed18ed42..92af9263b28 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)))
diff --git a/lisp/calc/calc-vec.el b/lisp/calc/calc-vec.el
index 5dfbc2d51f5..401a4f516c6 100644
--- a/lisp/calc/calc-vec.el
+++ b/lisp/calc/calc-vec.el
@@ -759,6 +759,7 @@
(math-reject-arg n "*Index out of range")))))
(defun calcFunc-subscr (mat n &optional m)
+ (if (eq (car-safe mat) 'var) nil)
(setq mat (calcFunc-mrow mat n))
(if m
(if (math-num-integerp n)