(ediff-diff-options): fixed the doc string

[gnu-emacs] / lisp / calc / calc-mode.el

diff --git a/lisp/calc/calc-mode.el b/lisp/calc/calc-mode.el
index 5e6272030493410871261e0d3379b6f2ede2b604..9b3bc297a80d78f4a222f0cac25a19bfa052caab 100644 (file)
--- a/lisp/calc/calc-mode.el
+++ b/lisp/calc/calc-mode.el
@@ -1,7 +1,7 @@
 ;;; calc-mode.el --- calculator modes for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
@@ -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 'sqmatrix) -3)
              (calc-matrix-mode)
              (t -1))
        (cond ((eq calc-simplify-mode 'none) -1)
@@ -408,7 +409,8 @@
                           ((= n 4) 'global)
                           ((= n 5) 'save)
                           (t 'local)))
-   (message (cond ((and (eq calc-mode-save-mode 'local) calc-embedded-info)
+   (message "%s" 
+           (cond ((and (eq calc-mode-save-mode 'local) calc-embedded-info)
                   "Recording mode changes with [calc-mode: ...]")
                  ((eq calc-mode-save-mode 'edit)
                   "Recording mode changes with [calc-edit-mode: ...]")
@@ -475,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) 'sqmatrix
+                              (prefix-numeric-value arg)))
                           ((eq calc-matrix-mode 'matrix) 'scalar)
                           ((eq calc-matrix-mode 'scalar) nil)
                           (t 'matrix)))
@@ -484,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 'sqmatrix)
+                    "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