From: Xue Fuqiao <xfq.free@gmail.com>
Date: Sun, 4 Aug 2013 03:01:42 +0000 (+0800)
Subject: Merge: cleanup for vc-ignore.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1686^2~441
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=00f98a9d5c2c1b7fc069478698778ea782cf6667;p=emacs.git

Merge: cleanup for vc-ignore.
---

00f98a9d5c2c1b7fc069478698778ea782cf6667
diff --cc lisp/ChangeLog
index a4453838399,5dfca6b8e2f..848c4e85407
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,16 -1,37 +1,40 @@@
 +2013-08-04  Juanma Barranquero  <lekktu@gmail.com>
 +
 +	* frameset.el (frameset-p, frameset-save): Fix autoload cookies.
 +	(frameset-filter-minibuffer): Doc fix.
 +	(frameset-restore): Fix autoload cookie.  Fix typo in docstring.
 +	(frameset--set-id, frameset--process-minibuffer-frames)
 +	(frameset-restore): Rename parameter `frameset-id' to `frame-id'.
 +	(frameset--reuse-frame): Pass correct frame-id to frameset--find-frame.
 +
 +	* desktop.el (desktop-clear): Only delete frames when called
 +	interactively and desktop-restore-frames is non-nil.  Doc fix.
 +	(desktop-read): Set desktop-saved-frameset to nil.
 +
+ 2013-08-04  Xue Fuqiao  <xfq.free@gmail.com>
+ 
+ 	* vc/vc.el (vc-ignore): Rewrite.
+ 	(vc-default-ignore-completion-table):
+ 	(vc--read-lines):
+ 	(vc--add-line, vc--remove-regexp): New functions.
+ 
+ 	* vc/vc-svn.el (vc-svn-ignore): Doc fix.
+ 	(vc-svn-ignore-completion-table): New function.
+ 
+ 	* vc/vc-hg.el (vc-hg-ignore): Rewrite.
+ 	(vc-hg-ignore-completion-table):
+ 	(vc-hg-find-ignore-file): New functions.
+ 
+ 	* vc/vc-git.el (vc-git-ignore): Rewrite.
+ 	(vc-git-ignore-completion-table):
+ 	(vc-git-find-ignore-file): New functions.
+ 
+ 	* vc/vc-dir.el (vc-dir-menu-map): Add menu for vc-dir-ignore.
+ 
+ 	* vc/vc-bzr.el (vc-bzr-ignore): Rewrite.
+ 	(vc-bzr-ignore-completion-table):
+ 	(vc-bzr-find-ignore-file): New functions.
+ 
 -2013-08-04  Juanma Barranquero  <lekktu@gmail.com>
 -
 -	* frameset.el (frameset-p, frameset-save): Fix autoload cookies.
 -	(frameset-filter-minibuffer): Doc fix.
 -	(frameset-restore): Fix autoload cookie.  Fix typo in docstring.
 -
 -	* desktop.el (desktop-clear): Only delete frames when called
 -	interactively and desktop-restore-frames is non-nil.  Doc fix.
 -	(desktop-read): Set desktop-saved-frameset to nil.
 -
  2013-08-03  Juanma Barranquero  <lekktu@gmail.com>
  
  	* frameset.el (frameset-prop): New function and setter.