[Emacs-diffs] trunk r113600: Fix for vc-ignore.

[Xue Fuqiao]

------------------------------------------------------------
revno: 113600
revision-id: address@hidden
parent: address@hidden
committer: Xue Fuqiao <address@hidden>
branch nick: trunk
timestamp: Tue 2013-07-30 22:29:14 +0800
message:
  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.
modified:
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/vc/vc-dir.el              vcdir.el-20091113204419-o5vbwnq5f7feedwu-8693
  lisp/vc/vc-hooks.el            vchooks.el-20091113204419-o5vbwnq5f7feedwu-501

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2013-07-30 00:29:09 +0000
+++ b/etc/NEWS  2013-07-30 14:29:14 +0000
@@ -237,7 +237,7 @@
 
 *** `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
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-07-30 14:27:04 +0000
+++ b/lisp/ChangeLog    2013-07-30 14:29:14 +0000
@@ -5,6 +5,10 @@
 
 2013-07-30  Xue Fuqiao  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/vc/vc-dir.el'
--- a/lisp/vc/vc-dir.el 2013-07-30 00:29:09 +0000
+++ b/lisp/vc/vc-dir.el 2013-07-30 14:29:14 +0000
@@ -279,7 +279,7 @@
     (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]

=== modified file 'lisp/vc/vc-hooks.el'
--- a/lisp/vc/vc-hooks.el       2013-06-09 11:15:54 +0000
+++ b/lisp/vc/vc-hooks.el       2013-07-30 14:29:14 +0000
@@ -918,6 +918,7 @@
     (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)