Merge from emacs-23

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

diff --git a/lisp/calc/calc-arith.el b/lisp/calc/calc-arith.el
index 2372b0ebbfb7d48d69251c713bb167787109a62e..bec3c0661cc7a4573296d2063070709754e09d24 100644 (file)
--- a/lisp/calc/calc-arith.el
+++ b/lisp/calc/calc-arith.el
@@ -1,27 +1,25 @@
 ;;; calc-arith.el --- arithmetic functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
-;; Maintainer: Jay Belanger <belanger@truman.edu>
+;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
 
 ;; This file is part of GNU Emacs.
 
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
 ;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY.  No author or distributor
-;; accepts responsibility to anyone for the consequences of using it
-;; or for whether it serves any particular purpose or works at all,
-;; unless he says so in writing.  Refer to the GNU Emacs General Public
-;; License for full details.
-
-;; Everyone is granted permission to copy, modify and redistribute
-;; GNU Emacs, but only under the conditions described in the
-;; GNU Emacs General Public License.   A copy of this license is
-;; supposed to have been given to you along with GNU Emacs so you
-;; can know your rights and responsibilities.  It should be in a
-;; file named COPYING.  Among other things, the copyright notice
-;; and this notice must be preserved on all copies.
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -334,6 +332,7 @@
             ((memq 'scalar (nth 1 decl))
              t)
             ((and (eq (car a) 'var)
+                  (symbolp (nth 2 a))
                   (boundp (nth 2 a))
                   (setq val (symbol-value (nth 2 a))))
              (math-check-known-scalarp val))
@@ -362,6 +361,7 @@
             ((memq 'matrix (nth 1 decl))
              t)
             ((and (eq (car a) 'var)
+                  (symbolp (nth 2 a))
                   (boundp (nth 2 a))
                   (setq val (symbol-value (nth 2 a))))
              (math-check-known-matrixp val))
@@ -3067,5 +3067,5 @@
 
 (provide 'calc-arith)
 
-;;; arch-tag: 6c396b5b-14c6-40ed-bb2a-7cc2e8111465
+;; arch-tag: 6c396b5b-14c6-40ed-bb2a-7cc2e8111465
 ;;; calc-arith.el ends here