mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-01 08:17:38 +00:00
Code Issues Releases Activity

(diff-mode-map, diff-mode-menu): Add diff-fine-highlight.

Browse Source
This commit is contained in:
Stefan Monnier 2007-10-09 04:22:11 +00:00
parent be36f934da
commit 011f48f234
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/diff-mode.el
View File

@ -48,8 +48,6 @@
;; Or maybe just make it into a ".rej to diff3-markers converter".
;; Maybe just use `wiggle' (by Neil Brown) to do it for us.
;;
;; - Refine hunk on a word-by-word basis.
;;
;; - in diff-apply-hunk, strip context in replace-match to better
;; preserve markers and spacing.
;; - Handle `diff -b' output in context->unified.
@ -156,6 +154,7 @@ when editing big diffs)."
;; `d' because it duplicates the context :-( --Stef
("\C-c\C-d" . diff-unified->context)
("\C-c\C-w" . diff-refine-ignore-spaces-hunk)
("\C-c\C-b" . diff-fine-highlight) ;No reason for `b' :-(
("\C-c\C-f" . next-error-follow-minor-mode))
"Keymap for `diff-mode'. See also `diff-mode-shared-map'.")
@ -173,7 +172,8 @@ when editing big diffs)."
;;["Fixup Headers" diff-fixup-modifs (not buffer-read-only)]
"-----"
["Split hunk" diff-split-hunk (diff-splittable-p)]
["Refine hunk" diff-refine-ignore-spaces-hunk t]
["Ignore whitespace changes" diff-refine-ignore-spaces-hunk t]
["Highlight fine changes" diff-fine-highlight t]
["Kill current hunk" diff-hunk-kill t]
["Kill current file's hunks" diff-file-kill t]
"-----"