From: Xue Fuqiao <xfq.free@gmail.com>
Date: Fri, 20 Sep 2013 05:39:53 +0000 (+0800)
Subject: Rename cvs-append-to-ignore to vc-cvs-append-to-ignore.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1505
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=98ccf24eab43a7434108cc6a5300e777356557e3;p=emacs.git

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 6042ed8bf5f..736bf8f14e6 100644
--- 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 7ada78fc09a..f32363a16a0 100644
--- 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 914eef4dd39..539e8b43735 100644
--- 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 11a30991391..57e23aba4d9 100644
--- 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."