From: Dmitry Gutov <dgutov@yandex.ru>
Date: Sat, 23 Mar 2013 17:43:18 +0000 (+0400)
Subject: * lisp/vc/diff-mode.el (diff-mode-shared-map): Unbind "/".
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~526^2~110
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b3082f497c788948254b21ce87ea3eba8b801e80;p=emacs.git

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

Fixes: debbugs:14034
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9bada64f768..731705b2aa9 100644
--- 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 d9224b29c2e..e945d6ef160 100644
--- 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)