Commit 25f72ec0 authored by Werner LEMBERG's avatar Werner LEMBERG
Browse files

* calc/calc-forms.el, calc/calc-sel: Replace `illegal' with

`invalid'.
parent dc3a0017
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.
......
;;; 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)
......
;;; 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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment