* vc/diff-mode.el (diff-mode-map): Shadow problematic bindings from
commita904a09a8b84daa15857197eed9eb99655d2bbb5
authorStefan Monnier <monnier@iro.umontreal.ca>
Fri, 18 Mar 2011 19:52:05 +0000 (18 15:52 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Fri, 18 Mar 2011 19:52:05 +0000 (18 15:52 -0400)
tree56687d2af51ed43107f5943724be5fd1bf91f9c9
parent1518e4f02dab44ba5388cd8b0699749ee30d3eff
* vc/diff-mode.el (diff-mode-map): Shadow problematic bindings from
diff-mode-shared-map.
(diff-mode-shared-map): Re-introduce some bindings that were problematic.

Fixes: debbugs:8284
lisp/ChangeLog
lisp/vc/diff-mode.el