Mercurial > emacs
comparison lisp/diff-mode.el @ 91073:4bc33ffdda1a
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 902-908)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 131-137)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 261-262)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 27 Oct 2007 09:12:07 +0000 |
parents | 12589730c028 59ee4068f60b |
children | 606f2d163a64 |
comparison
equal
deleted
inserted
replaced
91072:74ab3ea909f9 | 91073:4bc33ffdda1a |
---|---|
90 :type 'boolean | 90 :type 'boolean |
91 :group 'diff-mode) | 91 :group 'diff-mode) |
92 | 92 |
93 (defcustom diff-auto-refine t | 93 (defcustom diff-auto-refine t |
94 "Automatically highlight changes in detail as the user visits hunks." | 94 "Automatically highlight changes in detail as the user visits hunks." |
95 :type 'boolean) | 95 :type 'boolean |
96 :group 'diff-mode) | |
96 | 97 |
97 (defcustom diff-mode-hook nil | 98 (defcustom diff-mode-hook nil |
98 "Run after setting up the `diff-mode' major mode." | 99 "Run after setting up the `diff-mode' major mode." |
99 :type 'hook | 100 :type 'hook |
100 :options '(diff-delete-empty-files diff-make-unified) | 101 :options '(diff-delete-empty-files diff-make-unified) |
1683 ) | 1684 ) |
1684 | 1685 |
1685 (defun diff-refine-hunk () | 1686 (defun diff-refine-hunk () |
1686 "Highlight changes of hunk at point at a finer granularity." | 1687 "Highlight changes of hunk at point at a finer granularity." |
1687 (interactive) | 1688 (interactive) |
1688 (require 'smerge-mode) | 1689 (eval-and-compile (require 'smerge-mode)) |
1689 (save-excursion | 1690 (save-excursion |
1690 (diff-beginning-of-hunk 'try-harder) | 1691 (diff-beginning-of-hunk 'try-harder) |
1691 (let* ((style (diff-hunk-style)) ;Skips the hunk header as well. | 1692 (let* ((style (diff-hunk-style)) ;Skips the hunk header as well. |
1692 (beg (point)) | 1693 (beg (point)) |
1693 (props '((diff-mode . fine) (face diff-refine-change))) | 1694 (props '((diff-mode . fine) (face diff-refine-change))) |