diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-07-22 21:59:55 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-07-22 21:59:55 +0000 |
| commit | 8f2d38de67278017981023e70e331f0d42aa7927 (patch) | |
| tree | cf23bc6b9d301645d561fbe69404855b039f18a3 /lisp/diff-mode.el | |
| parent | 3dc04e8360589cfdf59f6919ee38c0ec1b50c5fe (diff) | |
| download | emacs-8f2d38de67278017981023e70e331f0d42aa7927.tar.gz | |
*** empty log message ***
Diffstat (limited to 'lisp/diff-mode.el')
| -rw-r--r-- | lisp/diff-mode.el | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 3c0208d5b27..cfebb365770 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el @@ -164,12 +164,23 @@ when editing big diffs)." '("Diff" ["Jump to Source" diff-goto-source t] ["Apply hunk" diff-apply-hunk t] + ["Test applying hunk" diff-test-hunk t] ["Apply diff with Ediff" diff-ediff-patch t] - ["-----" nil nil] + "-----" ["Reverse direction" diff-reverse-direction t] ["Context -> Unified" diff-context->unified t] ["Unified -> Context" diff-unified->context t] ;;["Fixup Headers" diff-fixup-modifs (not buffer-read-only)] + "-----" + ["Split hunk" diff-split-hunk t] + ["Refine hunk" diff-refine-hunk t] + ["Kill current hunk" diff-hunk-kill t] + ["Kill current file's hunks" diff-file-kill t] + "-----" + ["Previous Hunk" diff-hunk-prev t] + ["Next Hunk" diff-hunk-next t] + ["Previous File" diff-file-prev t] + ["Next File" diff-file-next t] )) (defcustom diff-minor-mode-prefix "\C-c=" |