Rename cvs-append-to-ignore to vc-cvs-append-to-ignore.

2013-09-20  Xue Fuqiao  <xfq.free@gmail.com>

	* lisp/vc/pcvs.el (cvs-mode-ignore):
	* lisp/vc/vc-cvs.el (vc-cvs-ignore, vc-cvs-append-to-ignore): Rename
	cvs-append-to-ignore to vc-cvs-append-to-ignore.

If/when someone complains about her package calling that function we
can add an obsolete alias at that point.

diff --git a/etc/NEWS b/etc/NEWS
index 6042ed8bf5fbf6e45f1e42147c07b77b0fe73776..736bf8f14e61ffad4e78b6a24e14c946ca1756f3 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -279,6 +279,9 @@ controlled tree in a window.
 under current version control system.  When called with a prefix
 argument, you can remove a file from the ignored file list.
 
+*** `cvs-append-to-ignore' has been renamed to `vc-cvs-append-to-ignore'
+because it is moved to vc-cvs.el.
+
 ** cl-lib
 
 *** New macro cl-tagbody.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ada78fc09a3441300f8376fa83f10c11f4e42e0..f32363a16a0ca04c0685acac585663dd79c0a34f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-20  Xue Fuqiao  <xfq.free@gmail.com>
+
+       * vc/pcvs.el (cvs-mode-ignore):
+       * vc/vc-cvs.el (vc-cvs-ignore, vc-cvs-append-to-ignore): Rename
+       cvs-append-to-ignore to vc-cvs-append-to-ignore.
+
 2013-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * eshell/em-ls.el: Use advice.  Remove redundant :group keywords.

diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el
index 914eef4dd39278f8f0dc74feabac13c686d9d7f2..539e8b43735d332ed2c1c16fd4286e4f3f7accee 100644 (file)
--- a/lisp/vc/pcvs.el
+++ b/lisp/vc/pcvs.el
@@ -1963,7 +1963,7 @@ With a prefix argument, prompt for cvs flags."
 This command ignores files that are not flagged as `Unknown'."
   (interactive)
   (dolist (fi (cvs-mode-marked 'ignore))
-    (cvs-append-to-ignore (cvs-fileinfo->dir fi) (cvs-fileinfo->file fi)
+    (vc-cvs-append-to-ignore (cvs-fileinfo->dir fi) (cvs-fileinfo->file fi)
                          (eq (cvs-fileinfo->subtype fi) 'NEW-DIR))
     (setf (cvs-fileinfo->type fi) 'DEAD))
   (cvs-cleanup-collection cvs-cookies nil nil nil))

diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index 11a3099139162e3cdebd62f23486f80b4188669e..57e23aba4d9fb33a77dc665d45199393b7d4bf26 100644 (file)
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -1228,10 +1228,9 @@ is non-nil."
 
 (defun vc-cvs-ignore (file &optional _directory _remove)
   "Ignore FILE under CVS."
-  (cvs-append-to-ignore (file-name-directory file) file))
+  (vc-cvs-append-to-ignore (file-name-directory file) file))
 
-;; FIXME This should be in the vc-cvs- namespace if it is to live here.
-(defun cvs-append-to-ignore (dir str &optional old-dir)
+(defun vc-cvs-append-to-ignore (dir str &optional old-dir)
   "In DIR, add STR to the .cvsignore file.
 If OLD-DIR is non-nil, then this is a directory that we don't want
 to hear about anymore."