diff options
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. |