diff-mode-map: Unhide some additional M-<foo>

* lisp/vc/diff-mode.el (diff-mode-map): Don't inherit M-?,
M-SPC, M-DEL and M-S-SPC bindings through from special-mode-map.

(cherry picked from commit 5b73625714ff6357170d83bff8fafa8d4c6a47c4)

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 7070e71fc783cde1be49276c585cbcf1fd71fea2..e0579331fa03eabd060ccb785046129685b33001 100644 (file)
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -206,7 +206,8 @@ The default \"-b\" means to ignore whitespace-only changes,
           ;; We want to inherit most bindings from
           ;; `diff-mode-shared-map', but not all since they may hide
           ;; useful `M-<foo>' global bindings when editing.
-          (dolist (key '("A" "r" "R" "g" "q" "W" "z"))
+          (dolist (key '("A" "r" "R" "g" "q" "W" "w" "z" "?"
+                         "SPC" "S-SPC" "DEL"))
             (keymap-set map key nil))
           map)
   ;; From compilation-minor-mode.