summaryrefslogtreecommitdiff
path: root/lisp/diff-mode.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2006-11-27 20:59:54 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2006-11-27 20:59:54 +0000
commitfe39af99e5099eab88f16a3e65f262752522e3f0 (patch)
tree4dc05ec3fd013664f8e2462373f09543793ff25d /lisp/diff-mode.el
parentff348fba8b3b38333492aef7ddcd5e17299e5cd9 (diff)
downloademacs-fe39af99e5099eab88f16a3e65f262752522e3f0.tar.gz
(diff-mode-map): Add a binding for unified->context.
Diffstat (limited to 'lisp/diff-mode.el')
-rw-r--r--lisp/diff-mode.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 01b3a5949f2..9226c537531 100644
--- 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'.")