aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorDmitry Gutov2013-03-23 21:43:18 +0400
committerDmitry Gutov2013-03-23 21:43:18 +0400
commitb3082f497c788948254b21ce87ea3eba8b801e80 (patch)
treea7e363bc8327459c533df448eb05249ffe042b19 /lisp
parentd7158313e21be4fb986627b38c2a5decc5844374 (diff)
downloademacs-b3082f497c788948254b21ce87ea3eba8b801e80.tar.gz
emacs-b3082f497c788948254b21ce87ea3eba8b801e80.zip
* lisp/vc/diff-mode.el (diff-mode-shared-map): Unbind "/".
Fixes: debbugs:14034
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc/diff-mode.el1
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9bada64f768..731705b2aa9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-03-23 Dmitry Gutov <dgutov@yandex.ru>
2
3 * vc/diff-mode.el (diff-mode-shared-map): Unbind "/" (Bug#14034).
4
12013-03-23 Leo Liu <sdl.web@gmail.com> 52013-03-23 Leo Liu <sdl.web@gmail.com>
2 6
3 * nxml/nxml-util.el (nxml-with-unmodifying-text-property-changes): 7 * 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)."
124 ("A" . diff-ediff-patch) 124 ("A" . diff-ediff-patch)
125 ("r" . diff-restrict-view) 125 ("r" . diff-restrict-view)
126 ("R" . diff-reverse-direction) 126 ("R" . diff-reverse-direction)
127 ("/" . diff-undo)
128 ([remap undo] . diff-undo)) 127 ([remap undo] . diff-undo))
129 "Basic keymap for `diff-mode', bound to various prefix keys." 128 "Basic keymap for `diff-mode', bound to various prefix keys."
130 :inherit special-mode-map) 129 :inherit special-mode-map)