From eac9c0efd68cdd7a65439bb3958da1db56391bc9 Mon Sep 17 00:00:00 2001 From: Werner LEMBERG Date: Fri, 25 Mar 2005 08:47:00 +0000 Subject: [PATCH] * progmodes/ebnf-abn.el, progmodes/ebnf-bnf.el, progmodes/ebnf-ebx.el, progmodes/ebnf-dtd.el, progmodes/ebnf-iso.el, progmodes/ebnf-yac.el, progmodes/ebnf2ps.el, progmodes/idlwave.el, progmodes/sh-script.el, progmodes/xscheme.el: Replace `illegal' with `invalid'. --- lisp/ChangeLog | 5 +++++ lisp/progmodes/ebnf-abn.el | 6 +++--- lisp/progmodes/ebnf-bnf.el | 8 ++++---- lisp/progmodes/ebnf-dtd.el | 6 +++--- lisp/progmodes/ebnf-ebx.el | 4 ++-- lisp/progmodes/ebnf-iso.el | 8 ++++---- lisp/progmodes/ebnf-yac.el | 8 ++++---- lisp/progmodes/ebnf2ps.el | 4 ++-- lisp/progmodes/idlwave.el | 7 ++++--- lisp/progmodes/sh-script.el | 2 +- lisp/progmodes/xscheme.el | 5 +++-- 11 files changed, 35 insertions(+), 28 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 49ffcbe2587..0739e8a0e00 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -8,6 +8,11 @@ * eshell/esh-io.el, eshell/esh-var.el: Replace `illegal' with `invalid'. * mail/supercite.el: Replace `illegal' with `invalid'. + * progmodes/ebnf-abn.el, progmodes/ebnf-bnf.el, + progmodes/ebnf-ebx.el, progmodes/ebnf-dtd.el, progmodes/ebnf-iso.el, + progmodes/ebnf-yac.el, progmodes/ebnf2ps.el, progmodes/idlwave.el, + progmodes/sh-script.el, progmodes/xscheme.el: Replace `illegal' with + `invalid'. 2005-03-24 Stefan Monnier diff --git a/lisp/progmodes/ebnf-abn.el b/lisp/progmodes/ebnf-abn.el index 35771a10f32..5bb0dd03913 100644 --- a/lisp/progmodes/ebnf-abn.el +++ b/lisp/progmodes/ebnf-abn.el @@ -1,6 +1,6 @@ ;;; ebnf-abn.el --- parser for ABNF (Augmented BNF) -;; Copyright (C) 2004 Free Sofware Foundation, Inc. +;; Copyright (C) 2004, 2005 Free Sofware Foundation, Inc. ;; Author: Vinicius Jose Latorre ;; Maintainer: Vinicius Jose Latorre @@ -518,7 +518,7 @@ See documentation for variable `ebnf-abn-lex'." 'end-of-input) ;; error ((eq token 'error) - (error "Illegal character")) + (error "Invalid character")) ;; end of rule ((eq token 'end-of-rule) 'end-of-rule) @@ -600,7 +600,7 @@ See documentation for variable `ebnf-abn-lex'." ((= (following-char) ?\n) t) (t - (error "Illegal character")) + (error "Invalid character")) )) diff --git a/lisp/progmodes/ebnf-bnf.el b/lisp/progmodes/ebnf-bnf.el index d32ad5a77c9..09db8f8865d 100644 --- a/lisp/progmodes/ebnf-bnf.el +++ b/lisp/progmodes/ebnf-bnf.el @@ -1,6 +1,6 @@ ;;; ebnf-bnf.el --- parser for EBNF -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ;; Free Sofware Foundation, Inc. ;; Author: Vinicius Jose Latorre @@ -461,7 +461,7 @@ See documentation for variable `ebnf-bnf-lex'." 'end-of-input) ;; error ((eq token 'error) - (error "Illegal character")) + (error "Invalid character")) ;; default ((eq token 'default) (forward-char) @@ -470,7 +470,7 @@ See documentation for variable `ebnf-bnf-lex'." (prog1 (ebnf-bnf-lex) (setq ebnf-default-p t)) - (error "Illegal `default' element"))) + (error "Invalid `default' element"))) ;; integer ((eq token 'integer) (setq ebnf-bnf-lex (ebnf-buffer-substring "0-9")) @@ -550,7 +550,7 @@ See documentation for variable `ebnf-bnf-lex'." (forward-char) t) (t - (error "Illegal character")) + (error "Invalid character")) )) diff --git a/lisp/progmodes/ebnf-dtd.el b/lisp/progmodes/ebnf-dtd.el index 9a99f222cc8..621cf424463 100644 --- a/lisp/progmodes/ebnf-dtd.el +++ b/lisp/progmodes/ebnf-dtd.el @@ -1,6 +1,6 @@ ;;; ebnf-dtd.el --- parser for DTD (Data Type Description for XML) -;; Copyright (C) 2004 Free Sofware Foundation, Inc. +;; Copyright (C) 2004, 2005 Free Sofware Foundation, Inc. ;; Author: Vinicius Jose Latorre ;; Maintainer: Vinicius Jose Latorre @@ -1181,7 +1181,7 @@ See documentation for variable `ebnf-dtd-lex'." 'end-of-input) ;; error ((eq token 'error) - (error "Illegal character")) + (error "Invalid character")) ;; beginning of declaration: ;; ;; Maintainer: Vinicius Jose Latorre @@ -453,7 +453,7 @@ See documentation for variable `ebnf-ebx-lex'." 'end-of-input) ;; error ((eq token 'error) - (error "Illegal character")) + (error "Invalid character")) ;; end of rule ((eq token 'end-of-rule) 'end-of-rule) diff --git a/lisp/progmodes/ebnf-iso.el b/lisp/progmodes/ebnf-iso.el index f36065bd558..ba28dfb5af9 100644 --- a/lisp/progmodes/ebnf-iso.el +++ b/lisp/progmodes/ebnf-iso.el @@ -1,6 +1,6 @@ ;;; ebnf-iso.el --- parser for ISO EBNF -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ;; Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre @@ -112,7 +112,7 @@ ;; ;; ISO EBNF accepts the characters given by production above, ;; HORIZONTAL TAB (^I), VERTICAL TAB (^K), NEWLINE (^J or ^M) and FORM FEED -;; (^L), any other characters are illegal. But ebnf2ps accepts also the +;; (^L), any other characters are invalid. But ebnf2ps accepts also the ;; european 8-bit accentuated characters (from \240 to \377) and underscore ;; (_). ;; @@ -427,7 +427,7 @@ See documentation for variable `ebnf-iso-lex'." 'end-of-input) ;; error ((eq token 'error) - (error "Illegal character")) + (error "Invalid character")) ;; integer ((eq token 'integer) (setq ebnf-iso-lex (ebnf-buffer-substring "0-9")) @@ -527,7 +527,7 @@ See documentation for variable `ebnf-iso-lex'." (forward-char) (setq pair (1+ pair)))) (t - (error "Illegal character")) + (error "Invalid character")) )))) diff --git a/lisp/progmodes/ebnf-yac.el b/lisp/progmodes/ebnf-yac.el index c7bf0e31541..58f422b1714 100644 --- a/lisp/progmodes/ebnf-yac.el +++ b/lisp/progmodes/ebnf-yac.el @@ -1,6 +1,6 @@ ;;; ebnf-yac.el --- parser for Yacc/Bison -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ;; Free Sofware Foundation, Inc. ;; Author: Vinicius Jose Latorre @@ -346,7 +346,7 @@ See documentation for variable `ebnf-yac-lex'." 'end-of-input) ;; error ((eq token 'error) - (error "Illegal character")) + (error "Invalid character")) ;; "string" ((eq token 'string) (setq ebnf-yac-lex (ebnf-get-string)) @@ -425,7 +425,7 @@ See documentation for variable `ebnf-yac-lex'." ((= (following-char) ?\') (ebnf-string " -&(-~" ?\' "character")) (t - (error "Illegal character")) + (error "Invalid character")) ))) (ebnf-yac-skip-spaces)) @@ -476,7 +476,7 @@ See documentation for variable `ebnf-yac-lex'." (forward-char) (setq not-end nil))) (t - (error "Illegal character")) + (error "Invalid character")) )))) diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el index 1d2f8d630e1..1a680ffa077 100644 --- a/lisp/progmodes/ebnf2ps.el +++ b/lisp/progmodes/ebnf2ps.el @@ -1,6 +1,6 @@ ;;; ebnf2ps.el --- translate an EBNF to a syntactic chart on PostScript -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ;; Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre @@ -5499,7 +5499,7 @@ killed after process termination." ;;(skip-chars-forward (concat chars "\240-\377") ebnf-limit) (skip-chars-forward (concat chars ebnf-8-bit-chars) ebnf-limit) (if (or (eobp) (/= (following-char) eos-char)) - (error "Illegal %s: missing `%c'" kind eos-char) + (error "Invalid %s: missing `%c'" kind eos-char) (forward-char) (1- (point)))))) diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index 8eba3847308..86ade8dec0f 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -1,5 +1,6 @@ ;; idlwave.el --- IDL editing mode for GNU Emacs -;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation +;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation ;; Authors: J.D. Smith ;; Carsten Dominik @@ -5587,7 +5588,7 @@ other completions will be tried.") (symbolp what) (assoc (symbol-name what) what-list)) what) - (t (error "Illegal WHAT")))) + (t (error "Invalid WHAT")))) (nil-list '(nil nil nil nil)) (class-list (list nil nil (or class t) nil))) @@ -5656,7 +5657,7 @@ other completions will be tried.") ((eq what 'class) (list nil-list nil-list 'class nil-list nil)) - (t (error "Illegal value for WHAT"))))) + (t (error "Invalid value for WHAT"))))) (defun idlwave-completing-read (&rest args) ;; Completing read, case insensitive diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 1e21d10cdc1..39ab54981f2 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -2388,7 +2388,7 @@ Optional parameter DEPTH (usually 1) says how many to look for." (defun sh-var-value (var &optional ignore-error) "Return the value of variable VAR, interpreting symbols. It can also return t or nil. -If an illegal value is found, throw an error unless Optional argument +If an invalid value is found, throw an error unless Optional argument IGNORE-ERROR is non-nil." (let ((val (symbol-value var))) (cond diff --git a/lisp/progmodes/xscheme.el b/lisp/progmodes/xscheme.el index 609c7db1e2a..bf1279da8a0 100644 --- a/lisp/progmodes/xscheme.el +++ b/lisp/progmodes/xscheme.el @@ -1,6 +1,7 @@ ;;; xscheme.el --- run MIT Scheme under Emacs -;; Copyright (C) 1986, 1987, 1989, 1990, 2001, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1986, 1987, 1989, 1990, 2001, 2004, 2005 +;; Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: languages, lisp @@ -408,7 +409,7 @@ characters perform useful functions. Commands: \\{scheme-debugger-mode-map}" - (error "Illegal entry to scheme-debugger-mode")) + (error "Invalid entry to scheme-debugger-mode")) (defun scheme-debugger-mode-initialize () (use-local-map scheme-debugger-mode-map)