aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Belanger2012-07-29 21:32:57 -0500
committerJay Belanger2012-07-29 21:32:57 -0500
commit4514c2522dc0d5a65698b5a2d397e53102b247eb (patch)
tree950d84709c113b68c34b321ec7658cfbc71f5256
parent4b33740959019dc33dc7ce3795ddc0b1594ae589 (diff)
downloademacs-4514c2522dc0d5a65698b5a2d397e53102b247eb.tar.gz
emacs-4514c2522dc0d5a65698b5a2d397e53102b247eb.zip
calc/calc-mode.el (calc-alg-simplify-mode): Remove function.
(calc-limited-simplify-mode): Renamed from calc-lim-simplify-mode. calc/calc-ext.el (calc-init-extensions): Fix bindings for `calc-limited-simplify-mode'.
-rw-r--r--lisp/calc/calc-ext.el4
-rw-r--r--lisp/calc/calc-mode.el2
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 883cc3dd939..954251f842b 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -459,7 +459,7 @@
459 (define-key calc-mode-map "mD" 'calc-default-simplify-mode) 459 (define-key calc-mode-map "mD" 'calc-default-simplify-mode)
460 (define-key calc-mode-map "mE" 'calc-ext-simplify-mode) 460 (define-key calc-mode-map "mE" 'calc-ext-simplify-mode)
461 (define-key calc-mode-map "mF" 'calc-settings-file-name) 461 (define-key calc-mode-map "mF" 'calc-settings-file-name)
462 (define-key calc-mode-map "mL" 'calc-lim-simplify-mode) 462 (define-key calc-mode-map "mL" 'calc-limited-simplify-mode)
463 (define-key calc-mode-map "mM" 'calc-more-recursion-depth) 463 (define-key calc-mode-map "mM" 'calc-more-recursion-depth)
464 (define-key calc-mode-map "mN" 'calc-num-simplify-mode) 464 (define-key calc-mode-map "mN" 'calc-num-simplify-mode)
465 (define-key calc-mode-map "mO" 'calc-no-simplify-mode) 465 (define-key calc-mode-map "mO" 'calc-no-simplify-mode)
@@ -1093,7 +1093,7 @@ calc-pi calc-radians-mode calc-sec calc-sech
1093calc-sin calc-sincos calc-sinh calc-sqrt 1093calc-sin calc-sincos calc-sinh calc-sqrt
1094calc-tan calc-tanh calc-to-degrees calc-to-radians) 1094calc-tan calc-tanh calc-to-degrees calc-to-radians)
1095 1095
1096 ("calc-mode" calc-lim-simplify-mode calc-algebraic-mode 1096 ("calc-mode" calc-limited-simplify-mode calc-algebraic-mode
1097calc-always-load-extensions calc-auto-recompute calc-auto-why 1097calc-always-load-extensions calc-auto-recompute calc-auto-why
1098calc-bin-simplify-mode calc-break-vectors calc-center-justify 1098calc-bin-simplify-mode calc-break-vectors calc-center-justify
1099calc-default-simplify-mode calc-display-raw calc-eng-notation 1099calc-default-simplify-mode calc-display-raw calc-eng-notation
diff --git a/lisp/calc/calc-mode.el b/lisp/calc/calc-mode.el
index 28cb58656c0..8403d7f7de9 100644
--- a/lisp/calc/calc-mode.el
+++ b/lisp/calc/calc-mode.el
@@ -542,7 +542,7 @@
542 (format "Binary simplification occurs by default (word size=%d)" 542 (format "Binary simplification occurs by default (word size=%d)"
543 calc-word-size)))) 543 calc-word-size))))
544 544
545(defun calc-lim-simplify-mode (arg) 545(defun calc-limited-simplify-mode (arg)
546 (interactive "P") 546 (interactive "P")
547 (calc-wrapper 547 (calc-wrapper
548 (calc-set-simplify-mode nil arg 548 (calc-set-simplify-mode nil arg