From: Xue Fuqiao <xfq.free@gmail.com>
Date: Tue, 30 Jul 2013 14:29:14 +0000 (+0800)
Subject: Fix for vc-ignore.
X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/207d1d0462a64116a764d4d5b64d4b8bebf83802

Fix for vc-ignore.

* vc/vc-hooks.el (vc-prefix-map): Add key binding for vc-ignore.

* vc/vc-dir.el (vc-dir-mode-map): Change key binding for vc-dir-ignore.
---

diff --git a/etc/NEWS b/etc/NEWS
index 1cd444e645..8deea16adb 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -237,7 +237,7 @@ The default separator is changed to allow surrounding spaces around the comma.
 
 *** `D' displays diffs between VC-controlled whole tree revisions.
 *** `L' lists the change log for the current VC controlled tree in a window.
-*** `I' ignores the file under current version control system.
+*** `G' ignores the file under current version control system.
 
 ** cl-lib
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42f50568b6..da0e85e47c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,10 @@
 
 2013-07-30  Xue Fuqiao  <xfq.free@gmail.com>
 
+	* vc/vc-hooks.el (vc-prefix-map): Add key binding for vc-ignore.
+
+	* vc/vc-dir.el (vc-dir-mode-map): Change key binding for vc-dir-ignore.
+
 	* vc/vc-svn.el (vc-svn-ignore): Remove `interactive'.  Use `*vc*'
 	buffer for output.
 
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 6f03cba1f7..ca22d885c8 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -279,7 +279,7 @@ See `run-hooks'."
     (define-key map "Q" 'vc-dir-query-replace-regexp)
     (define-key map (kbd "M-s a C-s")   'vc-dir-isearch)
     (define-key map (kbd "M-s a M-C-s") 'vc-dir-isearch-regexp)
-    (define-key map "I" 'vc-dir-ignore)
+    (define-key map "G" 'vc-dir-ignore)
 
     ;; Hook up the menu.
     (define-key map [menu-bar vc-dir-mode]
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 284481ee52..995565226b 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -918,6 +918,7 @@ current, and kill the buffer that visits the link."
     (define-key map "c" 'vc-rollback)
     (define-key map "d" 'vc-dir)
     (define-key map "g" 'vc-annotate)
+    (define-key map "G" 'vc-ignore)
     (define-key map "h" 'vc-insert-headers)
     (define-key map "i" 'vc-register)
     (define-key map "l" 'vc-print-log)