# HG changeset patch # User Stefan Monnier # Date 1185141595 0 # Node ID 93dd0897a3986dd41cfd7394dafdf65f2dc06ac5 # Parent da9840648bbd64ebd53a10be9f6144e4613a9bb1 *** empty log message *** diff -r da9840648bbd -r 93dd0897a398 lisp/ChangeLog --- a/lisp/ChangeLog Sun Jul 22 21:38:28 2007 +0000 +++ b/lisp/ChangeLog Sun Jul 22 21:59:55 2007 +0000 @@ -1,3 +1,7 @@ +2007-07-22 Dan Nicolaescu + + * diff-mode.el (diff-mode-menu): New entries. + 2007-07-22 Stefan Monnier * diff-mode.el (diff-unified->context): Use the new `apply' undo entry diff -r da9840648bbd -r 93dd0897a398 lisp/diff-mode.el --- a/lisp/diff-mode.el Sun Jul 22 21:38:28 2007 +0000 +++ b/lisp/diff-mode.el Sun Jul 22 21:59:55 2007 +0000 @@ -164,12 +164,23 @@ '("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="