From 8f2d38de67278017981023e70e331f0d42aa7927 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 22 Jul 2007 21:59:55 +0000 Subject: [PATCH] *** empty log message *** --- lisp/ChangeLog | 4 ++++ lisp/diff-mode.el | 13 ++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dc71e83d69d..043592ab416 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 --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=" -- 2.39.5