aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner LEMBERG2005-03-25 08:25:16 +0000
committerWerner LEMBERG2005-03-25 08:25:16 +0000
commitaaed846c01c90115574a8098dd1636ef1c866ab6 (patch)
tree78cc91c93e417621f68f5e2b81d3a016f4aaeda0
parent320cb80d2753ce9f99dd3f8aa014172de94a26d8 (diff)
downloademacs-aaed846c01c90115574a8098dd1636ef1c866ab6.tar.gz
emacs-aaed846c01c90115574a8098dd1636ef1c866ab6.zip
* vc-cvs.el: Replace `illegal' with `invalid'.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/vc-cvs.el5
2 files changed, 4 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4774ec0c084..38e38f2500a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,7 +2,7 @@
2 2
3 * calc/calc-forms.el, calc/calc-sel: Replace `illegal' with 3 * calc/calc-forms.el, calc/calc-sel: Replace `illegal' with
4 `invalid'. 4 `invalid'.
5 * midnight.el: Replace `illegal' with `invalid'. 5 * midnight.el, vc-cvs.el: Replace `illegal' with `invalid'.
6 6
72005-03-24 Stefan Monnier <monnier@iro.umontreal.ca> 72005-03-24 Stefan Monnier <monnier@iro.umontreal.ca>
8 8
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index ec24282702b..1136ce565a8 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -1,6 +1,7 @@
1;;; vc-cvs.el --- non-resident support for CVS version-control 1;;; vc-cvs.el --- non-resident support for CVS version-control
2 2
3;; Copyright (C) 1995,98,99,2000,2001,02,2003 Free Software Foundation, Inc. 3;; Copyright (C) 1995,98,99,2000,2001,02,2003, 2005
4;; Free Software Foundation, Inc.
4 5
5;; Author: FSF (see vc.el for full credits) 6;; Author: FSF (see vc.el for full credits)
6;; Maintainer: Andre Spiegel <spiegel@gnu.org> 7;; Maintainer: Andre Spiegel <spiegel@gnu.org>
@@ -745,7 +746,7 @@ is `local'.
745The default METHOD for a CVS root of the form 746The default METHOD for a CVS root of the form
746 [USER@]HOSTNAME:/path/to/repository 747 [USER@]HOSTNAME:/path/to/repository
747is `ext'. 748is `ext'.
748For an empty string, nil is returned (illegal CVS root)." 749For an empty string, nil is returned (invalid CVS root)."
749 ;; Split CVS root into colon separated fields (0-4). 750 ;; Split CVS root into colon separated fields (0-4).
750 ;; The `x:' makes sure, that leading colons are not lost; 751 ;; The `x:' makes sure, that leading colons are not lost;
751 ;; `HOST:/PATH' is then different from `:METHOD:/PATH'. 752 ;; `HOST:/PATH' is then different from `:METHOD:/PATH'.