[Emacs-diffs] Changes to emacs/lisp/calc/calc-mode.el

[Jay Belanger]

Index: emacs/lisp/calc/calc-mode.el
diff -c emacs/lisp/calc/calc-mode.el:1.16 emacs/lisp/calc/calc-mode.el:1.17
*** emacs/lisp/calc/calc-mode.el:1.16   Fri Oct  7 21:18:01 2005
--- emacs/lisp/calc/calc-mode.el        Mon Oct 10 19:38:02 2005
***************
*** 352,358 ****
        (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)
--- 352,358 ----
        (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 'sqmatrix) -3)
              (calc-matrix-mode)
              (t -1))
        (cond ((eq calc-simplify-mode 'none) -1)
***************
*** 478,484 ****
                           ((< (prefix-numeric-value arg) 1)
                            (and (< (prefix-numeric-value arg) -1) 'matrix))
                           (arg 
!                             (if (consp arg) 'square
                                (prefix-numeric-value arg)))
                           ((eq calc-matrix-mode 'matrix) 'scalar)
                           ((eq calc-matrix-mode 'scalar) nil)
--- 478,484 ----
                           ((< (prefix-numeric-value arg) 1)
                            (and (< (prefix-numeric-value arg) -1) 'matrix))
                           (arg 
!                             (if (consp arg) 'sqmatrix
                                (prefix-numeric-value arg)))
                           ((eq calc-matrix-mode 'matrix) 'scalar)
                           ((eq calc-matrix-mode 'scalar) nil)
***************
*** 488,494 ****
                calc-matrix-mode calc-matrix-mode)
       (message (if (eq calc-matrix-mode 'matrix)
                  "Variables are assumed to be matrices"
!                 (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)"
--- 488,494 ----
                calc-matrix-mode calc-matrix-mode)
       (message (if (eq calc-matrix-mode 'matrix)
                  "Variables are assumed to be matrices"
!                 (if (eq calc-matrix-mode 'sqmatrix)
                      "Variables are assumed to be square matrices"
                    (if calc-matrix-mode
                        "Variables are assumed to be scalars (non-matrices)"