neovim

commit 6db830e40e92dd61cd62d3e0bb5296e8b600cc18
parent 878b3b89c316138d99f9dbc47c84f2f94591df03
Author: Siddhant Agarwal <68201519+siddhantdev@users.noreply.github.com>
Date:   Thu,  6 Feb 2025 17:47:36 +0530

feat(defaults): enable diffopt "linematch" #32346


Diffstat:
M
runtime/doc/news.txt
 | 
1
+
M
runtime/doc/options.txt
 | 
2
+-
M
runtime/lua/vim/_meta/options.lua
 | 
2
+-
M
src/nvim/options.lua
 | 
2
+-
M
test/functional/legacy/scroll_opt_spec.lua
 | 
4
++--
M
test/old/testdir/setup.vim
 | 
1
+

6 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
@@ -72,6 +72,7 @@ DEFAULTS
 
 • 'number', 'relativenumber', 'signcolumn', and 'foldcolumn' are disabled in
   |terminal| buffers. See |terminal-config| for an example of changing these defaults.
+• 'diffopt' default includes "linematch:40".
 
 DIAGNOSTICS
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
@@ -2032,7 +2032,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	security reasons.
 
 						*'diffopt'* *'dip'*
-'diffopt' 'dip'		string	(default "internal,filler,closeoff")
+'diffopt' 'dip'		string	(default "internal,filler,closeoff,linematch:40")
 			global
 	Option settings for diff mode.  It can consist of the following items.
 	All are optional.  Items must be separated by a comma.
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
@@ -1739,7 +1739,7 @@ vim.go.dex = vim.go.diffexpr
 ---
 ---
 --- @type string
-vim.o.diffopt = "internal,filler,closeoff"
+vim.o.diffopt = "internal,filler,closeoff,linematch:40"
 vim.o.dip = vim.o.diffopt
 vim.go.diffopt = vim.o.diffopt
 vim.go.dip = vim.go.diffopt
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
@@ -2152,7 +2152,7 @@ local options = {
     {
       abbreviation = 'dip',
       cb = 'did_set_diffopt',
-      defaults = 'internal,filler,closeoff',
+      defaults = 'internal,filler,closeoff,linematch:40',
       -- Keep this in sync with diffopt_changed().
       values = {
         'filler',
diff --git a/test/functional/legacy/scroll_opt_spec.lua b/test/functional/legacy/scroll_opt_spec.lua
@@ -438,8 +438,8 @@ describe('smoothscroll', function()
       {7:  }bc abc abc abc abc abc ab│{7:  }bc abc abc abc abc abc ab|
       {7:  }c abc abc abc abc abc abc│{7:  }c abc abc abc abc abc abc|
       {7:  } abc abc abc abc abc     │{7:  } abc abc abc abc abc     |
-      {7:  }{27:foo}{4:                      }│{7:  }{27:barba^r}{4:                   }|
-      {7:  }{22:bar                      }│{7:  }{23:-------------------------}|
+      {7:  }{22:foo                      }│{7:  }{23:-------------------------}|
+      {7:  }{4:bar                      }│{7:  }{4:bar}{27:ba^r}{4:                   }|
       {7:  } abc abc abc abc abc abc │{7:  } abc abc abc abc abc abc |
       {7:  }abc abc abc abc abc abc a│{7:  }abc abc abc abc abc abc a|
       {7:  }bc abc abc abc abc abc ab│{7:  }bc abc abc abc abc abc ab|
diff --git a/test/old/testdir/setup.vim b/test/old/testdir/setup.vim
@@ -4,6 +4,7 @@ if exists('s:did_load')
   set complete=.,w,b,u,t,i
   set define=^\\s*#\\s*define
   set directory^=.
+  set diffopt=internal,filler,closeoff
   set display=
   set fillchars=vert:\|,foldsep:\|,fold:-
   set formatoptions=tcq