aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2007-07-22 21:59:55 +0000
committerStefan Monnier2007-07-22 21:59:55 +0000
commit8f2d38de67278017981023e70e331f0d42aa7927 (patch)
treecf23bc6b9d301645d561fbe69404855b039f18a3
parent3dc04e8360589cfdf59f6919ee38c0ec1b50c5fe (diff)
downloademacs-8f2d38de67278017981023e70e331f0d42aa7927.tar.gz
emacs-8f2d38de67278017981023e70e331f0d42aa7927.zip
*** empty log message ***
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/diff-mode.el13
2 files changed, 16 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dc71e83d69d..043592ab416 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-07-22 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * diff-mode.el (diff-mode-menu): New entries.
4
12007-07-22 Stefan Monnier <monnier@iro.umontreal.ca> 52007-07-22 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * diff-mode.el (diff-unified->context): Use the new `apply' undo entry 7 * 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)."
164 '("Diff" 164 '("Diff"
165 ["Jump to Source" diff-goto-source t] 165 ["Jump to Source" diff-goto-source t]
166 ["Apply hunk" diff-apply-hunk t] 166 ["Apply hunk" diff-apply-hunk t]
167 ["Test applying hunk" diff-test-hunk t]
167 ["Apply diff with Ediff" diff-ediff-patch t] 168 ["Apply diff with Ediff" diff-ediff-patch t]
168 ["-----" nil nil] 169 "-----"
169 ["Reverse direction" diff-reverse-direction t] 170 ["Reverse direction" diff-reverse-direction t]
170 ["Context -> Unified" diff-context->unified t] 171 ["Context -> Unified" diff-context->unified t]
171 ["Unified -> Context" diff-unified->context t] 172 ["Unified -> Context" diff-unified->context t]
172 ;;["Fixup Headers" diff-fixup-modifs (not buffer-read-only)] 173 ;;["Fixup Headers" diff-fixup-modifs (not buffer-read-only)]
174 "-----"
175 ["Split hunk" diff-split-hunk t]
176 ["Refine hunk" diff-refine-hunk t]
177 ["Kill current hunk" diff-hunk-kill t]
178 ["Kill current file's hunks" diff-file-kill t]
179 "-----"
180 ["Previous Hunk" diff-hunk-prev t]
181 ["Next Hunk" diff-hunk-next t]
182 ["Previous File" diff-file-prev t]
183 ["Next File" diff-file-next t]
173 )) 184 ))
174 185
175(defcustom diff-minor-mode-prefix "\C-c=" 186(defcustom diff-minor-mode-prefix "\C-c="