patch 9.1.1753: defaults: 'diffopt' option value can be improved

Problem:  defaults: 'diffopt' option value can be improved
Solution: Update diffopt defaults to include "indent-heuristic" and
          "inline:char" (Yee Cheng Chin)

The default diff options have not been updated much despite new
functionality having been added to Vim.

- indent-heurstic: This has been enabled by default in Git since
  33de716387 in 2017. Given that Vim uses xdiff from Git, it makes sense
  to track the default configuration from Git.

- inline:char: This turns on character-wise inline highlighting which is
  generally much better than the default inline:simple. It has been
  implemented since #16881 and we have not seen reports of any issues
  with it, and it has received good feedbacks.

closes: #18255

Signed-off-by: Yee Cheng Chin <ychin.git@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Yee Cheng Chin
2025-09-11 15:02:21 -04:00
committed by Christian Brabandt
parent b49d695fbc
commit 976b365305
12 changed files with 88 additions and 26 deletions

View File

@ -896,7 +896,7 @@ static struct vimoption options[] =
|P_NODUP,
#ifdef FEAT_DIFF
(char_u *)&p_dip, PV_NONE, did_set_diffopt, expand_set_diffopt,
{(char_u *)"internal,filler,closeoff,inline:simple",
{(char_u *)"internal,filler,closeoff,indent-heuristic,inline:char",
(char_u *)NULL}
#else
(char_u *)NULL, PV_NONE, NULL, NULL,