Mercurial > emacs
changeset 82036:93dd0897a398
*** empty log message ***
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sun, 22 Jul 2007 21:59:55 +0000 |
| parents | da9840648bbd |
| children | 1d7514cb50ef |
| files | lisp/ChangeLog lisp/diff-mode.el |
| diffstat | 2 files changed, 16 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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 <dann@ics.uci.edu> + + * diff-mode.el (diff-mode-menu): New entries. + 2007-07-22 Stefan Monnier <monnier@iro.umontreal.ca> * diff-mode.el (diff-unified->context): Use the new `apply' undo entry
--- 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="