2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index a1c9f9d02db..13d10f02b41 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -140,9 +140,9 @@ when editing big diffs)."
     ;; Standard M-r is useful, so don't change M-r or M-R.
     ;;("r" . diff-restrict-view)
     ;;("R" . diff-reverse-direction)
-    ("g" . revert-buffer)
-    ("q" . quit-window))
-  "Basic keymap for `diff-mode', bound to various prefix keys.")
+    )
+  "Basic keymap for `diff-mode', bound to various prefix keys."
+  :inherit special-mode-map)
 
 (easy-mmode-defmap diff-mode-map
   `(("\e" . ,diff-mode-shared-map)
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index 3b008c69d44..11ffc9a5e36 100644
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -125,9 +125,12 @@
 (require 'wid-edit)
 
 (easy-mmode-defmap log-view-mode-map
-  '(("z" . kill-this-buffer)
+  '(
+    ;; FIXME: (copy-keymap special-mode-map) instead
+    ("z" . kill-this-buffer)
     ("q" . quit-window)
     ("g" . revert-buffer)
+
     ("m" . log-view-toggle-mark-entry)
     ("e" . log-view-modify-change-comment)
     ("d" . log-view-diff)