Mercurial > emacs
changeset 60908:7b8e42efa46a
* calc/calc-forms.el, calc/calc-sel: Replace `illegal' with
`invalid'.
| author | Werner LEMBERG <wl@gnu.org> |
|---|---|
| date | Fri, 25 Mar 2005 08:16:06 +0000 |
| parents | a70b3b846344 |
| children | 3f516faa2ab3 |
| files | lisp/ChangeLog lisp/calc/calc-forms.el lisp/calc/calc-sel.el |
| diffstat | 3 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Mar 25 04:28:40 2005 +0000 +++ b/lisp/ChangeLog Fri Mar 25 08:16:06 2005 +0000 @@ -1,3 +1,8 @@ +2005-03-25 Werner Lemberg <wl@gnu.org> + + * calc/calc-forms.el, calc/calc-sel: Replace `illegal' with + `invalid'. + 2005-03-24 Stefan Monnier <monnier@iro.umontreal.ca> * comint.el (comint-insert-input): Obey mouse-yank-at-point.
--- a/lisp/calc/calc-forms.el Fri Mar 25 04:28:40 2005 +0000 +++ b/lisp/calc/calc-forms.el Fri Mar 25 08:16:06 2005 +0000 @@ -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 <daveg@synaptics.com> ;; Maintainer: Jay Belanger <belanger@truman.edu> @@ -1434,7 +1435,7 @@ (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 @@ (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)
--- a/lisp/calc/calc-sel.el Fri Mar 25 04:28:40 2005 +0000 +++ b/lisp/calc/calc-sel.el Fri Mar 25 08:16:06 2005 +0000 @@ -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 <daveg@synaptics.com> ;; Maintainer: Jay Belanger <belanger@truman.edu> @@ -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)