aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorXue Fuqiao2013-09-04 08:31:13 +0800
committerXue Fuqiao2013-09-04 08:31:13 +0800
commit63191d9f2043d2e67657e85a7b3842805dd1dad6 (patch)
treecb390bbda4b775652b1fd58b09d2df8e0013fc4f /doc
parent99191b89ff64172740add88e67f163619a07830c (diff)
downloademacs-63191d9f2043d2e67657e85a7b3842805dd1dad6.tar.gz
emacs-63191d9f2043d2e67657e85a7b3842805dd1dad6.zip
Some fixes for vc-ignore.
* lisp/vc/vc.el (vc-ignore): Rewrite. (vc-default-ignore): New function. (vc-default-ignore-completion-table): Use find-ignore-file. * lisp/vc/vc-bzr.el (vc-bzr-ignore, vc-bzr-ignore-completion-table): * lisp/vc/vc-git.el (vc-git-ignore, vc-git-ignore-completion-table): * lisp/vc/vc-hg.el (vc-hg-ignore, vc-hg-ignore-completion-table): Remove. Most code moved to vc.el. * doc/emacs/maintaining.texi (VC Ignore): Mention `vc-ignore' with prefix argument.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/maintaining.texi14
2 files changed, 12 insertions, 6 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index ad411e44ba6..73de1ce2920 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
12013-09-04 Xue Fuqiao <xfq.free@gmail.com>
2
3 * maintaining.texi (VC Ignore): Mention `vc-ignore' with prefix argument.
4
12013-07-31 Eli Zaretskii <eliz@gnu.org> 52013-07-31 Eli Zaretskii <eliz@gnu.org>
2 6
3 * emacs.texi (Top): Remove menu item for the removed "Disabling 7 * emacs.texi (Top): Remove menu item for the removed "Disabling
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 553375442d5..4a61db5509b 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1043,12 +1043,14 @@ Ignore a file under current version control system. (@code{vc-ignore}).
1043 1043
1044@kindex C-x v G 1044@kindex C-x v G
1045@findex vc-ignore 1045@findex vc-ignore
1046 Many source trees contain some files that do not need to be versioned, 1046 Many source trees contain some files that do not need to be
1047such as editor backups, object or bytecode files, and built programs. 1047versioned, such as editor backups, object or bytecode files, and built
1048You can simply not add them, but then they’ll always crop up as 1048programs. You can simply not add them, but then they’ll always crop
1049unknown files. You can also tell the version control system to ignore 1049up as unknown files. You can also tell the version control system to
1050these files by adding them to the ignore file at the top of the tree. 1050ignore these files by adding them to the ignore file at the top of the
1051@kbd{C-x v G} (@code{vc-ignore}) can help you do this. 1051tree. @kbd{C-x v G} (@code{vc-ignore}) can help you do this. When
1052called with a prefix argument, you can remove a file from the ignored
1053file list.
1052 1054
1053@node VC Directory Mode 1055@node VC Directory Mode
1054@subsection VC Directory Mode 1056@subsection VC Directory Mode