[Emacs-diffs] /srv/bzr/emacs/trunk r106542: Prevent Diff Mode from stealing M-z binding.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106542
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2011-11-28 20:03:11 +0200
message:
  Prevent Diff Mode from stealing M-z binding.
  
   lisp/vc/diff-mode.el (diff-mode-map): Don't inherit 'z' => 'M-z' from
   special-mode-map.
modified:
  lisp/ChangeLog
  lisp/vc/diff-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-11-28 06:26:39 +0000
+++ b/lisp/ChangeLog    2011-11-28 18:03:11 +0000
@@ -1,3 +1,8 @@
+2011-11-28  Eli Zaretskii  <address@hidden>
+
+       * vc/diff-mode.el (diff-mode-map): Don't inherit 'z' => 'M-z' from
+       special-mode-map.
+
 2011-11-28  Chong Yidong  <address@hidden>
 
        * emacs-lisp/easy-mmode.el (define-minor-mode): Fix default doc.

=== modified file 'lisp/vc/diff-mode.el'
--- a/lisp/vc/diff-mode.el      2011-10-20 00:26:14 +0000
+++ b/lisp/vc/diff-mode.el      2011-11-28 18:03:11 +0000
@@ -146,7 +146,7 @@
                ;; 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.