• 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
Name
Last commit
Last update
..
charsets Loading commit data...
e Loading commit data...
forms Loading commit data...
gnus Loading commit data...
images Loading commit data...
nxml Loading commit data...
org Loading commit data...
refcards Loading commit data...
schema Loading commit data...
srecode Loading commit data...
themes Loading commit data...
tutorials Loading commit data...
AUTHORS Loading commit data...
CALC-NEWS Loading commit data...
COPYING Loading commit data...
ChangeLog.1 Loading commit data...
DEBUG Loading commit data...
DEVEL.HUMOR Loading commit data...
DISTRIB Loading commit data...
ERC-NEWS Loading commit data...
ETAGS.EBNF Loading commit data...
ETAGS.README Loading commit data...
GNUS-NEWS Loading commit data...
HELLO Loading commit data...
HISTORY Loading commit data...
JOKES Loading commit data...
MACHINES Loading commit data...
MH-E-NEWS Loading commit data...
NEWS Loading commit data...
NEWS.1-17 Loading commit data...
NEWS.18 Loading commit data...
NEWS.19 Loading commit data...
NEWS.20 Loading commit data...
NEWS.21 Loading commit data...
NEWS.22 Loading commit data...
NEWS.23 Loading commit data...
NEWS.24 Loading commit data...
NEWS.25 Loading commit data...
NEWS.26 Loading commit data...
NEXTSTEP Loading commit data...
NXML-NEWS Loading commit data...
ORG-NEWS Loading commit data...
PROBLEMS Loading commit data...
README Loading commit data...
TERMS Loading commit data...
TODO Loading commit data...
compilation.txt Loading commit data...
edt-user.el Loading commit data...
emacs-buffer.gdb Loading commit data...
emacs.appdata.xml Loading commit data...
emacs.desktop Loading commit data...
emacs.icon Loading commit data...
emacs.service Loading commit data...
enriched.txt Loading commit data...
future-bug Loading commit data...
gnus-tut.txt Loading commit data...
grep.txt Loading commit data...
package-keyring.gpg Loading commit data...
ps-prin0.ps Loading commit data...
ps-prin1.ps Loading commit data...
publicsuffix.txt Loading commit data...
rgb.txt Loading commit data...
ses-example.ses Loading commit data...
spook.lines Loading commit data...
yow.lines Loading commit data...