(calc-matrix-mode, math-get-modes-vec): Add square matrix option.

diff --git a/lisp/calc/calc-mode.el b/lisp/calc/calc-mode.el
index 41b346ebd5ae92c3f58bcf23f1444c9faadc6a0d..7782b7a1f8372ceec09f1a142b7f0077fa8bcfea 100644 (file)
--- a/lisp/calc/calc-mode.el
+++ b/lisp/calc/calc-mode.el
@@ -352,6 +352,7 @@
        (if (eq calc-complex-mode 'polar) 1 0)
        (cond ((eq calc-matrix-mode 'scalar) 0)
              ((eq calc-matrix-mode 'matrix) -2)
+             ((eq calc-matrix-mode 'square) -3)
              (calc-matrix-mode)
              (t -1))
        (cond ((eq calc-simplify-mode 'none) -1)
@@ -476,7 +477,9 @@
                     (cond ((eq arg 0) 'scalar)
                           ((< (prefix-numeric-value arg) 1)
                            (and (< (prefix-numeric-value arg) -1) 'matrix))
-                          (arg (prefix-numeric-value arg))
+                          (arg 
+                            (if (consp arg) 'square
+                              (prefix-numeric-value arg)))
                           ((eq calc-matrix-mode 'matrix) 'scalar)
                           ((eq calc-matrix-mode 'scalar) nil)
                           (t 'matrix)))
@@ -485,9 +488,11 @@
                calc-matrix-mode calc-matrix-mode)
      (message (if (eq calc-matrix-mode 'matrix)
                  "Variables are assumed to be matrices"
-               (if calc-matrix-mode
-                   "Variables are assumed to be scalars (non-matrices)"
-                 "Variables are not assumed to be matrix or scalar"))))))
+                (if (eq calc-matrix-mode 'square)
+                    "Variables are assumed to be square matrices"
+                  (if calc-matrix-mode
+                      "Variables are assumed to be scalars (non-matrices)"
+                    "Variables are not assumed to be matrix or scalar")))))))
 
 (defun calc-set-simplify-mode (mode arg msg)
   (calc-change-mode 'calc-simplify-mode