• Charles A. Roelli's avatar
    Merge diff-font-lock-refine and diff-auto-refine-mode into diff-refine · d6b3e5bb
    Charles A. Roelli authored
    This change was discussed in Bug#32991.
    
    * admin/gitmerge.el (gitmerge-resolve): Bind 'diff-refine'
    instead of 'diff-auto-refine-mode' to nil.
    * doc/emacs/files.texi (Diff Mode): Explain 'diff-refine'
    instead of 'diff-auto-refine-mode' in the documentation of
    'diff-hunk-next' and 'diff-hunk-prev'.  Mention in the
    documentation of 'diff-refine-hunk' that refining is already
    done by default.
    * etc/NEWS (Diff mode): Explain renamed 'diff-refine' variable
    and mention deprecation and disabling of
    'diff-auto-refine-mode'.
    * lisp/vc/diff-mode.el (diff-font-lock-refine): Rename to
    'diff-refine' and allow choices nil, 'font-lock' and 'navigation'.
    (diff-auto-refine-mode): Disable it by default, make it
    obsolete and make it set 'diff-refine' appropriately to keep
    backward compatibility.
    (diff-hunk-next, diff-hunk-prev): Adapt to rename of
    diff-auto-refine-mode and ensure that refining only happens
    when calling these commands interactively.
    (diff--font-lock-refined): Adapt to rename of
    diff-font-lock-refine.
    * lisp/vc/smerge-mode.el (smerge-next, smerge-prev): Check
    that 'diff-refine' is set instead of checking
    'diff-auto-refine-mode' when deciding whether to refine a
    conflict.
    d6b3e5bb
NEWS 65.1 KB