Commit 8f2d38de authored by Stefan Monnier's avatar Stefan Monnier
Browse files

*** empty log message ***

parent 3dc04e83
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> 2007-07-22 Stefan Monnier <monnier@iro.umontreal.ca>
* diff-mode.el (diff-unified->context): Use the new `apply' undo entry * diff-mode.el (diff-unified->context): Use the new `apply' undo entry
......
...@@ -164,12 +164,23 @@ when editing big diffs)." ...@@ -164,12 +164,23 @@ when editing big diffs)."
'("Diff" '("Diff"
["Jump to Source" diff-goto-source t] ["Jump to Source" diff-goto-source t]
["Apply hunk" diff-apply-hunk t] ["Apply hunk" diff-apply-hunk t]
["Test applying hunk" diff-test-hunk t]
["Apply diff with Ediff" diff-ediff-patch t] ["Apply diff with Ediff" diff-ediff-patch t]
["-----" nil nil] "-----"
["Reverse direction" diff-reverse-direction t] ["Reverse direction" diff-reverse-direction t]
["Context -> Unified" diff-context->unified t] ["Context -> Unified" diff-context->unified t]
["Unified -> Context" diff-unified->context t] ["Unified -> Context" diff-unified->context t]
;;["Fixup Headers" diff-fixup-modifs (not buffer-read-only)] ;;["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=" (defcustom diff-minor-mode-prefix "\C-c="
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment