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'.

6 files changed, 37 insertions, 16 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3d22a8141b1..f09018223ed 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2012-07-31  Jay Belanger  <jay.p.belanger@gmail.com>
+
+	* 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'.
+
 2012-07-31  Bastien Guerry  <bzg@gnu.org>
 
 	* man.el (man): Fix comment.  (bug#12101)
diff --git a/lisp/calc/README b/lisp/calc/README
index b09ac6f79eb..f4f6b0fa0ba 100644
--- a/lisp/calc/README
+++ b/lisp/calc/README
@@ -74,7 +74,7 @@ Emacs 24.2
 
 Algebraic simplification mode is now the default.
 To restrict to the limited simplifications given by the former
-default simplification mode, use `m L'.
+default simplification mode, use `m I'.
 
 Emacs 24.1
 
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 954251f842b..338330a793b 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -454,12 +454,13 @@
   (define-key calc-mode-map "mv" 'calc-matrix-mode)
   (define-key calc-mode-map "mw" 'calc-working)
   (define-key calc-mode-map "mx" 'calc-always-load-extensions)
+  (define-key calc-mode-map "mA" 'calc-alg-simplify-mode)
   (define-key calc-mode-map "mB" 'calc-bin-simplify-mode)
   (define-key calc-mode-map "mC" 'calc-auto-recompute)
   (define-key calc-mode-map "mD" 'calc-default-simplify-mode)
   (define-key calc-mode-map "mE" 'calc-ext-simplify-mode)
   (define-key calc-mode-map "mF" 'calc-settings-file-name)
-  (define-key calc-mode-map "mL" 'calc-limited-simplify-mode)
+  (define-key calc-mode-map "mI" 'calc-basic-simplify-mode)
   (define-key calc-mode-map "mM" 'calc-more-recursion-depth)
   (define-key calc-mode-map "mN" 'calc-num-simplify-mode)
   (define-key calc-mode-map "mO" 'calc-no-simplify-mode)
@@ -1093,13 +1094,13 @@ calc-pi calc-radians-mode calc-sec calc-sech
 calc-sin calc-sincos calc-sinh calc-sqrt
 calc-tan calc-tanh calc-to-degrees calc-to-radians)
 
- ("calc-mode" calc-limited-simplify-mode calc-algebraic-mode
+ ("calc-mode" calc-alg-simplify-mode calc-algebraic-mode
 calc-always-load-extensions calc-auto-recompute calc-auto-why
-calc-bin-simplify-mode calc-break-vectors calc-center-justify
-calc-default-simplify-mode calc-display-raw calc-eng-notation
-calc-ext-simplify-mode calc-fix-notation calc-full-trail-vectors
-calc-full-vectors calc-get-modes calc-group-char calc-group-digits
-calc-infinite-mode calc-left-justify calc-left-label
+calc-basic-simplify-mode calc-bin-simplify-mode calc-break-vectors 
+calc-center-justify calc-default-simplify-mode calc-display-raw 
+calc-eng-notation calc-ext-simplify-mode calc-fix-notation 
+calc-full-trail-vectors calc-full-vectors calc-get-modes calc-group-char 
+calc-group-digits calc-infinite-mode calc-left-justify calc-left-label
 calc-line-breaking calc-line-numbering calc-matrix-brackets
 calc-matrix-center-justify calc-matrix-left-justify calc-matrix-mode
 calc-matrix-right-justify calc-mode-record-mode calc-no-simplify-mode
diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el
index f48fae388d5..b17c6b4e3b8 100644
--- a/lisp/calc/calc-help.el
+++ b/lisp/calc/calc-help.el
@@ -642,7 +642,7 @@ C-w  Describe how there is no warranty for Calc."
    '("Deg, Rad, HMS; Frac; Polar; Inf; Alg, Total; Symb; Vec/mat"
      "Working; Xtensions; Mode-save; preserve Embedded modes"
      "SHIFT + Shifted-prefixes, mode-Filename; Record; reCompute"
-     "SHIFT + simplify: Off, Num, Limited, Default, Bin, Ext, Units")
+     "SHIFT + simplify: Off, Num, basIc, Algebraic, Bin, Ext, Units")
    "mode" ?m))
 
 
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")
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index dd1efd014fb..3e6ae1c7404 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -1760,7 +1760,7 @@ See calc-keypad for details."
 			   ((eq calc-simplify-mode 'alg) "")
 			   ((eq calc-simplify-mode 'ext) "ExtSimp ")
 			   ((eq calc-simplify-mode 'units) "UnitSimp ")
-			   (t "LimSimp "))
+			   (t "BasicSimp "))
 
 		     ;; Display modes
 		     (cond ((= calc-number-radix 10) "")