aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/calc
diff options
context:
space:
mode:
authorWerner LEMBERG <[email protected]>2005-03-25 08:16:06 +0000
committerWerner LEMBERG <[email protected]>2005-03-25 08:16:06 +0000
commit25f72ec049aaf1414a260a27317a545b3793f8bb (patch)
tree0ce8cc268e00802ff34c634ff1c0d9a77b330780 /lisp/calc
parentdc3a0017dbbde6024a57cb7d20e23c7604338f0d (diff)
* calc/calc-forms.el, calc/calc-sel: Replace `illegal' with
`invalid'.
Diffstat (limited to 'lisp/calc')
-rw-r--r--lisp/calc/calc-forms.el7
-rw-r--r--lisp/calc/calc-sel.el5
2 files changed, 7 insertions, 5 deletions
diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el
index d4ddada6a0..4870891231 100644
--- a/lisp/calc/calc-forms.el
+++ b/lisp/calc/calc-forms.el
@@ -1,6 +1,7 @@
;;; calc-forms.el --- data format conversion functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004, 2005
+;; Free Software Foundation, Inc.
;; Author: David Gillespie <[email protected]>
;; Maintainer: Jay Belanger <[email protected]>
@@ -1434,7 +1435,7 @@ and ends on the last Sunday of October at 2 a.m."
(defun calcFunc-badd (a b)
(if (eq (car-safe b) 'date)
(if (eq (car-safe a) 'date)
- (math-reject-arg nil "*Illegal combination in date arithmetic")
+ (math-reject-arg nil "*Invalid combination in date arithmetic")
(calcFunc-badd b a))
(if (eq (car-safe a) 'date)
(if (Math-realp b)
@@ -1452,7 +1453,7 @@ and ends on the last Sunday of October at 2 a.m."
(if hours
(setq b (math-div b (cdr hours))))
(calcFunc-badd a b))
- (math-reject-arg nil "*Illegal combination in date arithmetic")))
+ (math-reject-arg nil "*Invalid combination in date arithmetic")))
(math-reject-arg a 'datep))))
(defun calcFunc-holiday (a)
diff --git a/lisp/calc/calc-sel.el b/lisp/calc/calc-sel.el
index 4ae0df5d3b..04cb2bee2b 100644
--- a/lisp/calc/calc-sel.el
+++ b/lisp/calc/calc-sel.el
@@ -1,6 +1,7 @@
;;; calc-sel.el --- data selection functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005
+;; Free Software Foundation, Inc.
;; Author: David Gillespie <[email protected]>
;; Maintainer: Jay Belanger <[email protected]>
@@ -490,7 +491,7 @@
(mapcar 'calc-replace-sub-formula-rec (cdr expr))))))
(defun calc-sel-error ()
- (error "Illegal operation on sub-formulas"))
+ (error "Invalid operation on sub-formulas"))
(defun calc-replace-selections (n vals m)
(if (calc-top-selected n m)