[Emacs-diffs] /srv/bzr/emacs/trunk r109339: calc-mode.el (calc-basic-simplification-mode): Rename from

[Jay Belanger]

------------------------------------------------------------
revno: 109339
committer: Jay Belanger <address@hidden>
branch nick: trunk
timestamp: Tue 2012-07-31 16:32:28 -0500
message:
  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'.
modified:
  lisp/ChangeLog
  lisp/calc/README
  lisp/calc/calc-ext.el
  lisp/calc/calc-help.el
  lisp/calc/calc-mode.el
  lisp/calc/calc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-31 13:34:20 +0000
+++ b/lisp/ChangeLog    2012-07-31 21:32:28 +0000
@@ -1,3 +1,17 @@
+2012-07-31  Jay Belanger  <address@hidden>
+
+       * 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  <address@hidden>
 
        * man.el (man): Fix comment.  (bug#12101)

=== modified file 'lisp/calc/README'
--- a/lisp/calc/README  2012-07-29 23:19:09 +0000
+++ b/lisp/calc/README  2012-07-31 21:32:28 +0000
@@ -74,7 +74,7 @@
 
 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
 

=== modified file 'lisp/calc/calc-ext.el'
--- a/lisp/calc/calc-ext.el     2012-07-30 02:32:57 +0000
+++ b/lisp/calc/calc-ext.el     2012-07-31 21:32:28 +0000
@@ -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-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

=== modified file 'lisp/calc/calc-help.el'
--- a/lisp/calc/calc-help.el    2012-07-29 23:25:39 +0000
+++ b/lisp/calc/calc-help.el    2012-07-31 21:32:28 +0000
@@ -642,7 +642,7 @@
    '("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))
 
 

=== modified file 'lisp/calc/calc-mode.el'
--- a/lisp/calc/calc-mode.el    2012-07-30 02:32:57 +0000
+++ b/lisp/calc/calc-mode.el    2012-07-31 21:32:28 +0000
@@ -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")

=== modified file 'lisp/calc/calc.el'
--- a/lisp/calc/calc.el 2012-07-29 23:19:09 +0000
+++ b/lisp/calc/calc.el 2012-07-31 21:32:28 +0000
@@ -1760,7 +1760,7 @@
                           ((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) "")