]> git.ipfire.org Git - thirdparty/vim.git/commit
patch 9.1.1753: defaults: 'diffopt' option value can be improved v9.1.1753
authorYee Cheng Chin <ychin.git@gmail.com>
Thu, 11 Sep 2025 19:02:21 +0000 (15:02 -0400)
committerChristian Brabandt <cb@256bit.org>
Thu, 11 Sep 2025 19:02:21 +0000 (15:02 -0400)
commit976b365305c2e9025813ff3c7fe52f8d927fafc3
treea7a5929fbe3f800a1af0cc9865480f3e40dc5e0c
parentb49d695fbc7b93b5e8f3b8deac3118b369d8f7e0
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>
12 files changed:
runtime/doc/options.txt
runtime/doc/version9.txt
src/diff.c
src/optiondefs.h
src/testdir/dumps/Test_diff_10.dump
src/testdir/dumps/Test_diff_with_cursorline_01.dump
src/testdir/dumps/Test_diff_with_cursorline_02.dump
src/testdir/dumps/Test_diff_with_cursorline_03.dump
src/testdir/dumps/Test_smooth_diff_change_line_3a.dump [new file with mode: 0644]
src/testdir/test_diffmode.vim
src/testdir/test_scroll_opt.vim
src/version.c