Mercurial > emacs
changeset 74269:fa6583f5269e
(diff-mode-map): Add a binding for unified->context.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 27 Nov 2006 20:59:54 +0000 |
| parents | 3de22dfd43f8 |
| children | b2adac2912de |
| files | lisp/ChangeLog lisp/diff-mode.el |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Nov 27 20:58:37 2006 +0000 +++ b/lisp/ChangeLog Mon Nov 27 20:59:54 2006 +0000 @@ -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.
--- a/lisp/diff-mode.el Mon Nov 27 20:58:37 2006 +0000 +++ b/lisp/diff-mode.el Mon Nov 27 20:59:54 2006 +0000 @@ -120,8 +120,8 @@ ("\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 @@ ("\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'.")