diff options
| author | Jay Belanger | 2011-02-26 19:33:37 -0600 |
|---|---|---|
| committer | Jay Belanger | 2011-02-26 19:33:37 -0600 |
| commit | b49df7426b4647433b2309c4f320133e4ce37009 (patch) | |
| tree | 8ef508290e8111cdd506f5f838f10655be47d0db | |
| parent | e573299d40e5825584ed9e8bd58f5a8c2deee6fd (diff) | |
| download | emacs-b49df7426b4647433b2309c4f320133e4ce37009.tar.gz emacs-b49df7426b4647433b2309c4f320133e4ce37009.zip | |
* 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.
| -rw-r--r-- | lisp/ChangeLog | 11 | ||||
| -rw-r--r-- | lisp/calc/calc-ext.el | 2 | ||||
| -rw-r--r-- | lisp/calc/calc-math.el | 2 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2011-02-27 Jay Belanger <jay.p.belanger@gmail.com> | ||
| 2 | |||
| 3 | * calc/calc-ext.el (calc-init-extensions): | ||
| 4 | Autoload `calc-l-prefix-help' instead of `calc-ul-prefix-help'. | ||
| 5 | |||
| 6 | * calc/calc-math.el (calcFunc-log10): Don't signal an error in | ||
| 7 | symbolic mode. | ||
| 8 | |||
| 9 | * calc/calc-vec.el (calcFunc-subscr): Return nil if the first | ||
| 10 | argument is a variable. | ||
| 11 | |||
| 1 | 2011-02-26 Stefan Monnier <monnier@iro.umontreal.ca> | 12 | 2011-02-26 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 13 | ||
| 3 | * emacs-lisp/assoc.el: Remove misleading `sort' (bug#8126). | 14 | * 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 | |||
| 1061 | calc-hyperbolic-prefix-help calc-inv-hyp-prefix-help calc-option-prefix-help | 1061 | calc-hyperbolic-prefix-help calc-inv-hyp-prefix-help calc-option-prefix-help |
| 1062 | calc-inverse-prefix-help calc-j-prefix-help calc-k-prefix-help | 1062 | calc-inverse-prefix-help calc-j-prefix-help calc-k-prefix-help |
| 1063 | calc-m-prefix-help calc-r-prefix-help calc-s-prefix-help | 1063 | calc-m-prefix-help calc-r-prefix-help calc-s-prefix-help |
| 1064 | calc-t-prefix-help calc-u-prefix-help calc-ul-prefix-help | 1064 | calc-t-prefix-help calc-u-prefix-help calc-l-prefix-help |
| 1065 | calc-v-prefix-help) | 1065 | calc-v-prefix-help) |
| 1066 | 1066 | ||
| 1067 | ("calc-incom" calc-begin-complex calc-begin-vector calc-comma | 1067 | ("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." | |||
| 1574 | (if calc-infinite-mode | 1574 | (if calc-infinite-mode |
| 1575 | '(neg (var inf var-inf)) | 1575 | '(neg (var inf var-inf)) |
| 1576 | (math-reject-arg x "*Logarithm of zero"))) | 1576 | (math-reject-arg x "*Logarithm of zero"))) |
| 1577 | (calc-symbolic-mode (signal 'inexact-result nil)) | 1577 | ;;(calc-symbolic-mode (signal 'inexact-result nil)) |
| 1578 | ((Math-numberp x) | 1578 | ((Math-numberp x) |
| 1579 | (math-with-extra-prec 2 | 1579 | (math-with-extra-prec 2 |
| 1580 | (let ((xf (math-float x))) | 1580 | (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 @@ | |||
| 759 | (math-reject-arg n "*Index out of range"))))) | 759 | (math-reject-arg n "*Index out of range"))))) |
| 760 | 760 | ||
| 761 | (defun calcFunc-subscr (mat n &optional m) | 761 | (defun calcFunc-subscr (mat n &optional m) |
| 762 | (if (eq (car-safe mat) 'var) nil) | ||
| 762 | (setq mat (calcFunc-mrow mat n)) | 763 | (setq mat (calcFunc-mrow mat n)) |
| 763 | (if m | 764 | (if m |
| 764 | (if (math-num-integerp n) | 765 | (if (math-num-integerp n) |