(diff-mode-map): Add a binding for unified->context.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b17ebc895e3f6ea37f6e4f7cc2189d8ad310f4cf..c6477d0406719e0dc12fe586ed6071c35b786581 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2006-11-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * diff-mode.el (diff-mode-map): Add a binding for unified->context.
+
        * server.el: Remove spurious * in docstrings.
        (server-process-filter): Exit from recursive editing before processing
        a new request.

diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 01b3a5949f24dda611b703a76fbfc02e1185df96..9226c537531a495b084b9bafa1db9a3953c8a653 100644 (file)
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -120,8 +120,8 @@ when editing big diffs)."
     ("\C-m" . diff-goto-source)
     ([mouse-2] . diff-goto-source)
     ;; From XEmacs' diff-mode.
-;; Standard M-w is useful, so don't change M-W.
-;;    ("W" . widen)
+    ;; Standard M-w is useful, so don't change M-W.
+    ;;("W" . widen)
     ;;("." . diff-goto-source)         ;display-buffer
     ;;("f" . diff-goto-source)         ;find-file
     ("o" . diff-goto-source)           ;other-window
@@ -153,6 +153,8 @@ when editing big diffs)."
     ("\C-c\C-s" . diff-split-hunk)
     ("\C-c\C-t" . diff-test-hunk)
     ("\C-c\C-u" . diff-context->unified)
+    ;; `d' because it duplicates the context :-(  --Stef
+    ("\C-c\C-d" . diff-unified->context)
     ("\C-c\C-w" . diff-refine-hunk)
     ("\C-c\C-f" . next-error-follow-minor-mode))
   "Keymap for `diff-mode'.  See also `diff-mode-shared-map'.")