summaryrefslogtreecommitdiff
path: root/lisp/calc/calc.el
diff options
context:
space:
mode:
authorJay Belanger <jay.p.belanger@gmail.com>2012-07-29 18:19:09 -0500
committerJay Belanger <jay.p.belanger@gmail.com>2012-07-29 18:19:09 -0500
commit1823ac5abe03117aab926ff0d51a189d513251ce (patch)
treed112892af598e398534a8e4b7585982f86a25299 /lisp/calc/calc.el
parentd5040d2dec0f7e08b715ce6952d5568ed86d1812 (diff)
downloademacs-1823ac5abe03117aab926ff0d51a189d513251ce.tar.gz
calc/calc.el (calc-simplify-mode): Make 'alg the default value.
(calc-set-mode-line): Don't display "AlgSimp ". calc/calc-mode.el (calc-alg-simplify-mode): Remove function. (calc-lim-simplify-mode): New function. (calc-set-simplify-mode): Default to 'alg. (calc-default-simplify-mode): Make algebraic simplifications the default. calc/calc-ext.el (calc-init-extensions): Remove binding for `calc-alg-simplify-mode'. Add binding for `calc-lim-simplify-mode'. calc/README: Mention new default simplification mode.
Diffstat (limited to 'lisp/calc/calc.el')
-rw-r--r--lisp/calc/calc.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index a149cfe7966..dd1efd014fb 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -698,11 +698,11 @@ If `C' is present, display outer brackets for matrices (centered).")
(defcalcmodevar calc-previous-modulo nil
"Most recently used value of M in a modulo form.")
-(defcalcmodevar calc-simplify-mode nil
+(defcalcmodevar calc-simplify-mode 'alg
"Type of simplification applied to results.
If `none', results are not simplified when pushed on the stack.
If `num', functions are simplified only when args are constant.
-If nil, only fast simplifications are applied.
+If nil, only limited simplifications are applied.
If `binary', `math-clip' is applied if appropriate.
If `alg', `math-simplify' is applied.
If `ext', `math-simplify-extended' is applied.
@@ -1757,10 +1757,10 @@ See calc-keypad for details."
((eq calc-simplify-mode 'num) "NumSimp ")
((eq calc-simplify-mode 'binary)
(format "BinSimp%d " calc-word-size))
- ((eq calc-simplify-mode 'alg) "AlgSimp ")
+ ((eq calc-simplify-mode 'alg) "")
((eq calc-simplify-mode 'ext) "ExtSimp ")
((eq calc-simplify-mode 'units) "UnitSimp ")
- (t ""))
+ (t "LimSimp "))
;; Display modes
(cond ((= calc-number-radix 10) "")