diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-27 09:12:07 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-27 09:12:07 +0000 |
| commit | 18cd1f1a08833b0baad21c1d7b13a6845d95cf57 (patch) | |
| tree | 03f33df7513d15bd5de0348aec35ef82bd061508 /lisp/diff-mode.el | |
| parent | 74863e7a78b1c8da1094a8250660a009c3b23015 (diff) | |
| parent | fdc9061358d3654e14bfc1419632e1d6c6c5c13e (diff) | |
| download | emacs-18cd1f1a08833b0baad21c1d7b13a6845d95cf57.tar.gz | |
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
Diffstat (limited to 'lisp/diff-mode.el')
| -rw-r--r-- | lisp/diff-mode.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 0208660c1a9..9e9eb81797a 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el @@ -92,7 +92,8 @@ when editing big diffs)." (defcustom diff-auto-refine t "Automatically highlight changes in detail as the user visits hunks." - :type 'boolean) + :type 'boolean + :group 'diff-mode) (defcustom diff-mode-hook nil "Run after setting up the `diff-mode' major mode." @@ -1685,7 +1686,7 @@ For use in `add-log-current-defun-function'." (defun diff-refine-hunk () "Highlight changes of hunk at point at a finer granularity." (interactive) - (require 'smerge-mode) + (eval-and-compile (require 'smerge-mode)) (save-excursion (diff-beginning-of-hunk 'try-harder) (let* ((style (diff-hunk-style)) ;Skips the hunk header as well. |