From b49df7426b4647433b2309c4f320133e4ce37009 Mon Sep 17 00:00:00 2001 From: Jay Belanger Date: Sat, 26 Feb 2011 19:33:37 -0600 Subject: [PATCH] * 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. --- lisp/ChangeLog | 11 +++++++++++ lisp/calc/calc-ext.el | 2 +- lisp/calc/calc-math.el | 2 +- lisp/calc/calc-vec.el | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8d4ccfbf652..d9f4c3c3ea2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2011-02-27 Jay Belanger + + * 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): Return nil if the first + argument is a variable. + 2011-02-26 Stefan Monnier * emacs-lisp/assoc.el: Remove misleading `sort' (bug#8126). 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) -- 2.39.2