From: Jay Belanger <jay.p.belanger@gmail.com>
Date: Mon, 10 Oct 2005 19:59:18 +0000 (+0000)
Subject: (math-check-known-square-matrixp): Change order in which value is checked.
X-Git-Tag: emacs-pretest-22.0.90~6687
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=16d661843e858435b4f51500cac2616222adb59b;p=emacs.git

(math-check-known-square-matrixp): Change order in which value is checked.
---

diff --git a/lisp/calc/calc-arith.el b/lisp/calc/calc-arith.el
index 810ed7bdd9f..feb3c9d25a8 100644
--- a/lisp/calc/calc-arith.el
+++ b/lisp/calc/calc-arith.el
@@ -383,8 +383,6 @@
            (cond
             ((memq 'sqmatrix (nth 1 decl))
              t)
-            ((memq 'matrix (nth 1 decl))
-             nil)
             ((and (eq (car a) 'var)
                   (boundp (nth 2 a))
                   (setq val (symbol-value (nth 2 a))))
@@ -394,6 +392,8 @@
                    (eq calc-matrix-mode 'sqmatrix))
                   (eq (car-safe a) 'var))
              t)
+            ((memq 'matrix (nth 1 decl))
+             nil)
             (t
              nil))))))