(calc-matrix-mode, calc-set-mode-line): Change the mode name `square'

to 'sqmatrix'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 94ba10803c574c300a7f7ff9eb2b9e1ed7d5b218..71500bade970334d8c3d3d872ad56b5407ccc526 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2005-10-10  Jay Belanger  <belanger@truman.edu>
+
+       * calc/calc-arith.el (math-check-known-scalarp)
+       (math-check-known-matrixp): Check the values of arguments that are
+       variables.
+       (math-check-known-square-matrixp): New function.
+       (math-known-square-matrixp): Use math-check-known-square-matrixp.
+       (math-super-types): Add sqmatrix type.
+
+       * calc/calc-mode.el (calc-matrix-mode, math-get-modes-vec): Change the
+       mode name `square' to 'sqmatrix'.
+
+       * calc/calc.el (calc-matrix-mode, calc-set-mode-line): Change the
+       mode name `square' to 'sqmatrix'.
+
 2005-10-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/etags.el (select-tags-table-mode): Don't use

diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 2220376904fb541e93093ce55f47e9fef44ade87..4c6820ca90e4bd259d64dd0d6b730d3b3a843165 100644 (file)
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -654,7 +654,7 @@ If nil, computations on numbers always yield numbers where possible.")
 (defcalcmodevar calc-matrix-mode nil
   "If `matrix', variables are assumed to be matrix-valued.
 If a number, variables are assumed to be NxN matrices.
-If `square', variables are assumed to be square matrices of an unspecified size.
+If `sqmatrix', variables are assumed to be square matrices of an unspecified size.
 If `scalar', variables are assumed to be scalar-valued.
 If nil, symbolic math routines make no assumptions about variables.")
 
@@ -1552,7 +1552,7 @@ See calc-keypad for details."
                     (cond ((eq calc-matrix-mode 'matrix) "Matrix ")
                           ((integerp calc-matrix-mode)
                            (format "Matrix%d " calc-matrix-mode))
-                          ((eq calc-matrix-mode 'square) "SqMatrix ")
+                          ((eq calc-matrix-mode 'sqmatrix) "SqMatrix ")
                           ((eq calc-matrix-mode 'scalar) "Scalar ")
                           (t ""))
                     (if (eq calc-complex-mode 'polar) "Polar " "")