[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.15 emacs/lisp/calc/calc-mode.el:1.16
*** emacs/lisp/calc/calc-mode.el:1.15   Sun Sep 18 12:42:35 2005
--- emacs/lisp/calc/calc-mode.el        Fri Oct  7 21:18:01 2005
***************
*** 352,357 ****
--- 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)
***************
*** 476,482 ****
                     (cond ((eq arg 0) 'scalar)
                           ((< (prefix-numeric-value arg) 1)
                            (and (< (prefix-numeric-value arg) -1) 'matrix))
!                          (arg (prefix-numeric-value arg))
                           ((eq calc-matrix-mode 'matrix) 'scalar)
                           ((eq calc-matrix-mode 'scalar) nil)
                           (t 'matrix)))
--- 477,485 ----
                     (cond ((eq arg 0) 'scalar)
                           ((< (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)
                           (t 'matrix)))
***************
*** 485,493 ****
                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"))))))
  
  (defun calc-set-simplify-mode (mode arg msg)
    (calc-change-mode 'calc-simplify-mode
--- 488,498 ----
                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)"
!                     "Variables are not assumed to be matrix or scalar")))))))
  
  (defun calc-set-simplify-mode (mode arg msg)
    (calc-change-mode 'calc-simplify-mode