diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc/diff-mode.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 16f81a1729c..7dabb7db106 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-11-28 Eli Zaretskii <eliz@gnu.org> + + * vc/diff-mode.el (diff-mode-map): Don't inherit 'z' => 'M-z' from + special-mode-map. + 2011-11-28 Chong Yidong <cyd@gnu.org> * emacs-lisp/easy-mmode.el (define-minor-mode): Fix default doc. diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 9f0fa584b0d..dd919ea7ebf 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -146,7 +146,7 @@ when editing big diffs)." ;; but not all since they may hide useful M-<foo> global ;; bindings when editing. (set-keymap-parent map diff-mode-shared-map) - (dolist (key '("A" "r" "R" "g" "q" "W")) + (dolist (key '("A" "r" "R" "g" "q" "W" "z")) (define-key map key nil)) map)) ;; From compilation-minor-mode. |