* lisp/vc/diff-mode.el (diff-mode-shared-map): Unbind "/".

Fixes: debbugs:14034

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9bada64f76879e8efcb9a422929ec692cbc2986b..731705b2aa9dda5dd434c43239f8a5a3050c0925 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-23  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * vc/diff-mode.el (diff-mode-shared-map): Unbind "/" (Bug#14034).
+
 2013-03-23  Leo Liu  <sdl.web@gmail.com>
 
        * nxml/nxml-util.el (nxml-with-unmodifying-text-property-changes):

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index d9224b29c2e013bbef9c700ece9841f78d42d30b..e945d6ef160992511036f68e7e8e38194f7a5dda 100644 (file)
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -124,7 +124,6 @@ when editing big diffs)."
     ("A" . diff-ediff-patch)
     ("r" . diff-restrict-view)
     ("R" . diff-reverse-direction)
-    ("/" . diff-undo)
     ([remap undo] . diff-undo))
   "Basic keymap for `diff-mode', bound to various prefix keys."
   :inherit special-mode-map)