diff options
| author | Xue Fuqiao | 2013-07-30 22:29:14 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-07-30 22:29:14 +0800 |
| commit | 207d1d0462a64116a764d4d5b64d4b8bebf83802 (patch) | |
| tree | d0023bd915dfcb6c375f239df7ef2cbd737ff559 | |
| parent | 5a2a77359adb44501542f4a4d55e309b8dafbc6a (diff) | |
| download | emacs-207d1d0462a64116a764d4d5b64d4b8bebf83802.tar.gz emacs-207d1d0462a64116a764d4d5b64d4b8bebf83802.zip | |
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.
| -rw-r--r-- | etc/NEWS | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc/vc-dir.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc-hooks.el | 1 |
4 files changed, 7 insertions, 2 deletions
| @@ -237,7 +237,7 @@ The default separator is changed to allow surrounding spaces around the comma. | |||
| 237 | 237 | ||
| 238 | *** `D' displays diffs between VC-controlled whole tree revisions. | 238 | *** `D' displays diffs between VC-controlled whole tree revisions. |
| 239 | *** `L' lists the change log for the current VC controlled tree in a window. | 239 | *** `L' lists the change log for the current VC controlled tree in a window. |
| 240 | *** `I' ignores the file under current version control system. | 240 | *** `G' ignores the file under current version control system. |
| 241 | 241 | ||
| 242 | ** cl-lib | 242 | ** cl-lib |
| 243 | 243 | ||
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 42f50568b6e..da0e85e47c7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -5,6 +5,10 @@ | |||
| 5 | 5 | ||
| 6 | 2013-07-30 Xue Fuqiao <xfq.free@gmail.com> | 6 | 2013-07-30 Xue Fuqiao <xfq.free@gmail.com> |
| 7 | 7 | ||
| 8 | * vc/vc-hooks.el (vc-prefix-map): Add key binding for vc-ignore. | ||
| 9 | |||
| 10 | * vc/vc-dir.el (vc-dir-mode-map): Change key binding for vc-dir-ignore. | ||
| 11 | |||
| 8 | * vc/vc-svn.el (vc-svn-ignore): Remove `interactive'. Use `*vc*' | 12 | * vc/vc-svn.el (vc-svn-ignore): Remove `interactive'. Use `*vc*' |
| 9 | buffer for output. | 13 | buffer for output. |
| 10 | 14 | ||
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el index 6f03cba1f75..ca22d885c8d 100644 --- a/lisp/vc/vc-dir.el +++ b/lisp/vc/vc-dir.el | |||
| @@ -279,7 +279,7 @@ See `run-hooks'." | |||
| 279 | (define-key map "Q" 'vc-dir-query-replace-regexp) | 279 | (define-key map "Q" 'vc-dir-query-replace-regexp) |
| 280 | (define-key map (kbd "M-s a C-s") 'vc-dir-isearch) | 280 | (define-key map (kbd "M-s a C-s") 'vc-dir-isearch) |
| 281 | (define-key map (kbd "M-s a M-C-s") 'vc-dir-isearch-regexp) | 281 | (define-key map (kbd "M-s a M-C-s") 'vc-dir-isearch-regexp) |
| 282 | (define-key map "I" 'vc-dir-ignore) | 282 | (define-key map "G" 'vc-dir-ignore) |
| 283 | 283 | ||
| 284 | ;; Hook up the menu. | 284 | ;; Hook up the menu. |
| 285 | (define-key map [menu-bar vc-dir-mode] | 285 | (define-key map [menu-bar vc-dir-mode] |
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 284481ee524..995565226b8 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." | |||
| 918 | (define-key map "c" 'vc-rollback) | 918 | (define-key map "c" 'vc-rollback) |
| 919 | (define-key map "d" 'vc-dir) | 919 | (define-key map "d" 'vc-dir) |
| 920 | (define-key map "g" 'vc-annotate) | 920 | (define-key map "g" 'vc-annotate) |
| 921 | (define-key map "G" 'vc-ignore) | ||
| 921 | (define-key map "h" 'vc-insert-headers) | 922 | (define-key map "h" 'vc-insert-headers) |
| 922 | (define-key map "i" 'vc-register) | 923 | (define-key map "i" 'vc-register) |
| 923 | (define-key map "l" 'vc-print-log) | 924 | (define-key map "l" 'vc-print-log) |