diff options
| author | Jay Belanger <jay.p.belanger@gmail.com> | 2012-07-31 16:32:28 -0500 |
|---|---|---|
| committer | Jay Belanger <jay.p.belanger@gmail.com> | 2012-07-31 16:32:28 -0500 |
| commit | d2605269ba0941921d18a328a15450b2689b5431 (patch) | |
| tree | 2b6be35238635f272f3a6bfe43898d2c8b18a5a7 /lisp/calc/calc-mode.el | |
| parent | 331ff3b90629b4cc2014e49938d6971a6bffd941 (diff) | |
| download | emacs-d2605269ba0941921d18a328a15450b2689b5431.tar.gz | |
calc-mode.el (calc-basic-simplification-mode): Rename from
`calc-limited-simplification-mode'.
(calc-alg-simplification-mode): New function.
calc.el (calc-set-mode-line): Adjust mode line display
for basic simplification mode.
calc-help.el (calc-m-prefix-help): Update help message.
calc-ext.el (calc-init-extensions): Add bindings and autoloads
for `calc-basic-simplify-mode' and `calc-alg-simplify-mode'.
Diffstat (limited to 'lisp/calc/calc-mode.el')
| -rw-r--r-- | lisp/calc/calc-mode.el | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/lisp/calc/calc-mode.el b/lisp/calc/calc-mode.el index 8403d7f7de9..5ac40da91f6 100644 --- a/lisp/calc/calc-mode.el +++ b/lisp/calc/calc-mode.el @@ -510,24 +510,24 @@ (interactive "P") (calc-wrapper (calc-set-simplify-mode 'none arg - "All default simplifications are disabled"))) + "Simplification is disabled"))) (defun calc-num-simplify-mode (arg) (interactive "P") (calc-wrapper (calc-set-simplify-mode 'num arg - "Default simplifications apply only if arguments are numeric"))) + "Basic simplifications apply only if arguments are numeric"))) (defun calc-default-simplify-mode (arg) (interactive "P") (cond ((or (not arg) (= arg 3)) (calc-wrapper (calc-set-simplify-mode - 'alg nil "Default algebraic simplifications enabled"))) + 'alg nil "Algebraic simplification occurs by default"))) ((= arg 1) (calc-wrapper (calc-set-simplify-mode - nil nil "Limited simplifications occur by default"))) + nil nil "Only basic simplifications occur by default"))) ((= arg 0) (calc-num-simplify-mode 1)) ((< arg 0) (calc-no-simplify-mode 1)) ((= arg 2) (calc-bin-simplify-mode 1)) @@ -542,11 +542,17 @@ (format "Binary simplification occurs by default (word size=%d)" calc-word-size)))) -(defun calc-limited-simplify-mode (arg) +(defun calc-basic-simplify-mode (arg) (interactive "P") (calc-wrapper (calc-set-simplify-mode nil arg - "Limited simplifications occur by default"))) + "Only basic simplifications occur by default"))) + +(defun calc-alg-simplify-mode (arg) + (interactive "P") + (calc-wrapper + (calc-set-simplify-mode 'alg arg + "Algebraic simplification occurs by default"))) (defun calc-ext-simplify-mode (arg) (interactive "P") |