diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2014-12-02 05:31:04 -0500 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2014-12-02 05:31:04 -0500 |
| commit | e6fe301afe4bbc707d2fde44a5250b84418d2b1b (patch) | |
| tree | 90c79f8671aa6fbc122859e63a047455dee89e56 /lisp | |
| parent | 92411a0d2e8a78e2eb05fa26e8a9bd978d5e01fe (diff) | |
| download | emacs-e6fe301afe4bbc707d2fde44a5250b84418d2b1b.tar.gz emacs-e6fe301afe4bbc707d2fde44a5250b84418d2b1b.tar.bz2 emacs-e6fe301afe4bbc707d2fde44a5250b84418d2b1b.zip | |
Another longstanding to-do: bind vc-delete-file.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/vc/vc-hooks.el | 1 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d005cbef920..6ffdd0adc06 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,11 @@ 2014-12-02 Eric S. Raymond <esr@snark.thyrsus.com> + * vc-hooks.el: Bind vc-delete-file to Ctrl-x v delete. + + * vc.el (vc-expand-dirs): Now takes a second BACKEND argument, + improving behavior on directories using multiple file-oriented + VCSes. + * vc/vc.el and all backends: API simplification; clear-headers is no longer a public method. It is now local to the one place it's used, in the RCS steal-lock method. diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index c4acef95e9e..61918c9886e 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -893,6 +893,7 @@ current, and kill the buffer that visits the link." (define-key map "=" 'vc-diff) (define-key map "D" 'vc-root-diff) (define-key map "~" 'vc-revision-other-window) + (define-key map "[delete]" 'vc-delete-file) map)) (fset 'vc-prefix-map vc-prefix-map) (define-key ctl-x-map "v" 'vc-prefix-map) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index ad3a2c49735..1b82bfd939d 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -602,15 +602,13 @@ ;;; Todo: -;; - Add key-binding for vc-delete-file. - ;;;; New Primitives: ;; ;; - deal with push operations. ;; ;;;; Primitives that need changing: ;; -;; - vc-update/vc-merge should deal with VC systems that don't +;; - vc-update/vc-merge should deal with VC systems that don't do ;; update/merge on a file basis, but on a whole repository basis. ;; vc-update and vc-merge assume the arguments are always files, ;; they don't deal with directories. Make sure the *vc-dir* buffer |