mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-08-28 01:51:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1252: typos in code and docs related to 'diffopt' "inline:" (#33143)

Browse Source 
Problem:  Typos in code and docs related to 'diffopt' "inline:".
          (after v9.1.1243)
Solution: Fix typos and slightly improve the docs.
          (zeertzjq)

closes: vim/vim#16997

5a307c361c
This commit is contained in:
zeertzjq
2025-03-29 07:01:49 +08:00
committed by GitHub
parent f4ee0ab2f1
commit cb31663663
6 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
runtime/doc/diff.txt
View File

@@ -231,12 +231,11 @@ The diffs are highlighted with these groups:
highlight the exact difference between the
two. Will respect any 'diffopt' flag that
affects internal diff.
Not used when `inline:` set to "none".
|hl-DiffTextAdd| DiffTextAdd Added text inside a Changed line. Similar to
Not used when `inline:` is set to "none".
|hl-DiffTextAdd| DiffTextAdd Added text inside a Changed line. Similar to
DiffText, but used when there is no
corresponding text in other buffers. Will not
be used when `inline:` is set to "simple" or
"none".
corresponding text in other buffers. Not used
when `inline:` is set to "simple" or "none".
|hl-DiffDelete| DiffDelete Deleted lines. Also called filler lines,
because they don't really exist in this
buffer.

4
runtime/doc/options.txt
View File

@@ -2125,8 +2125,8 @@ A jump table for the options with a short description can be found at |Q_op|.
none Do not perform inline highlighting.
simple Highlight from first different
character to the last one in each
line. This is the default if nothing
is set.
line. This is the default if no
`inline:` value is set.
char Use internal diff to perform a
character-wise diff and highlight the
difference.

4
runtime/lua/vim/_meta/options.lua generated
View File

@@ -1722,8 +1722,8 @@ vim.go.dex = vim.go.diffexpr
--- none Do not perform inline highlighting.
--- simple Highlight from first different
--- character to the last one in each
--- line. This is the default if nothing
--- is set.
--- line. This is the default if no
--- `inline:` value is set.
--- char Use internal diff to perform a
--- character-wise diff and highlight the
--- difference.