diff options
| author | Stefan Monnier | 2010-04-12 15:14:16 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2010-04-12 15:14:16 -0400 |
| commit | a544e7c143dc0db6b3f7a37a8fb51eec083f3479 (patch) | |
| tree | 05f18f9f7f3daa798d8c228e0db300e42242e49c | |
| parent | a1979d8e663dda359d3edfda7052721241a5da42 (diff) | |
| download | emacs-a544e7c143dc0db6b3f7a37a8fb51eec083f3479.tar.gz emacs-a544e7c143dc0db6b3f7a37a8fb51eec083f3479.zip | |
(vc-dir-kill-line): New command.
(vc-dir-mode-map): Bind it to C-k.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc-dir.el | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3ce0bb91c64..05ecc80f7eb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2010-04-12 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2010-04-12 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * vc-dir.el (vc-dir-kill-line): New command. | ||
| 4 | (vc-dir-mode-map): Bind it to C-k. | ||
| 5 | |||
| 3 | * bookmark.el (bookmark-insert-location): Handle a nil filename. | 6 | * bookmark.el (bookmark-insert-location): Handle a nil filename. |
| 4 | 7 | ||
| 5 | * woman.el: Add bookmark declarations to silence the compiler. | 8 | * woman.el: Add bookmark declarations to silence the compiler. |
diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el index 1eaec28e8be..4b95321d366 100644 --- a/lisp/vc-dir.el +++ b/lisp/vc-dir.el | |||
| @@ -263,6 +263,7 @@ See `run-hooks'." | |||
| 263 | (define-key map [mouse-2] 'vc-dir-toggle-mark) | 263 | (define-key map [mouse-2] 'vc-dir-toggle-mark) |
| 264 | (define-key map [follow-link] 'mouse-face) | 264 | (define-key map [follow-link] 'mouse-face) |
| 265 | (define-key map "x" 'vc-dir-hide-up-to-date) | 265 | (define-key map "x" 'vc-dir-hide-up-to-date) |
| 266 | (define-key map [?\C-k] 'vc-dir-kill-line) | ||
| 266 | (define-key map "S" 'vc-dir-search) ;; FIXME: Maybe use A like dired? | 267 | (define-key map "S" 'vc-dir-search) ;; FIXME: Maybe use A like dired? |
| 267 | (define-key map "Q" 'vc-dir-query-replace-regexp) | 268 | (define-key map "Q" 'vc-dir-query-replace-regexp) |
| 268 | (define-key map (kbd "M-s a C-s") 'vc-dir-isearch) | 269 | (define-key map (kbd "M-s a C-s") 'vc-dir-isearch) |
| @@ -1088,6 +1089,13 @@ outside of VC) and one wants to do some operation on it." | |||
| 1088 | (ewoc-delete vc-ewoc crt)) | 1089 | (ewoc-delete vc-ewoc crt)) |
| 1089 | (setq crt prev))))) | 1090 | (setq crt prev))))) |
| 1090 | 1091 | ||
| 1092 | (defun vc-dir-kill-line () | ||
| 1093 | "Remove the current line from display." | ||
| 1094 | (interactive) | ||
| 1095 | (let ((crt (ewoc-locate vc-ewoc)) | ||
| 1096 | (inhibit-read-only t)) | ||
| 1097 | (ewoc-delete vc-ewoc crt))) | ||
| 1098 | |||
| 1091 | (defun vc-dir-printer (fileentry) | 1099 | (defun vc-dir-printer (fileentry) |
| 1092 | (vc-call-backend vc-dir-backend 'dir-printer fileentry)) | 1100 | (vc-call-backend vc-dir-backend 'dir-printer fileentry)) |
| 1093 | 1101 | ||