diff options
| author | Werner LEMBERG <wl@gnu.org> | 2005-03-25 08:16:06 +0000 |
|---|---|---|
| committer | Werner LEMBERG <wl@gnu.org> | 2005-03-25 08:16:06 +0000 |
| commit | 25f72ec049aaf1414a260a27317a545b3793f8bb (patch) | |
| tree | 0ce8cc268e00802ff34c634ff1c0d9a77b330780 /lisp | |
| parent | dc3a0017dbbde6024a57cb7d20e23c7604338f0d (diff) | |
| download | emacs-25f72ec049aaf1414a260a27317a545b3793f8bb.tar.gz | |
* calc/calc-forms.el, calc/calc-sel: Replace `illegal' with
`invalid'.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/calc/calc-forms.el | 7 | ||||
| -rw-r--r-- | lisp/calc/calc-sel.el | 5 |
3 files changed, 12 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c87a9df10c7..99ff97a561d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el index d4ddada6a0c..4870891231a 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 <daveg@synaptics.com> ;; Maintainer: Jay Belanger <belanger@truman.edu> @@ -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 4ae0df5d3ba..04cb2bee2bd 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 <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) |