Make auto-refining a minor mode, and diff- and smerge- use it.

* diff-mode.el (diff-auto-refine): Delete defcustom.
(diff-auto-refine-mode): New func/var via define-minor-mode.
Update var ref to use diff-auto-refine-mode.
* smerge-mode.el (diff-mode): Require when compiling.
(smerge-auto-refine): Delete defcustom.
Update smerge-auto-refine ref to use diff-auto-refine-mode.

1 files changed, 3 insertions, 2 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 859a37b0c8f..a507af05777 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -579,7 +579,7 @@ set a variable's `safe-local-variable' and `risky-local-variable' property.
 
 *** diff-refine-hunk highlights word-level details of changes in a diff hunk.
 It's used automatically as you move through hunks, see
-diff-auto-refine.  It is bound to `C-c C-b'.
+diff-auto-refine-mode.  It is bound to `C-c C-b'.
 
 *** diff-add-change-log-entries-other-window iterates through the diff
 buffer and tries to create ChangeLog entries for each change.
@@ -784,7 +784,8 @@ It is used to configure wireless interfaces.
 *** sgml-electric-tag-pair-mode lets you simultaneously edit matched tag pairs.
 
 *** smerge-refine highlights word-level details of changes in conflict.
-It's used automatically as you move through conflicts, see smerge-auto-refine.
+It's used automatically as you move through conflicts, see
+smerge-auto-refine-mode.
 
 *** talk.el has been extended for multiple tty support.