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