commit ee60bf6112da006768848f2a9198005bfb664951
parent c2781d3db3efa3a86d9f383a0886567ff38e4d63
Author: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 29 Oct 2025 07:20:23 +0800
vim-patch:6be154f: runtime(doc): revert wrong 'incsearch' description
This reverts commit 3fc00c05fb464d3e806df53bdc1743faa337ddca.
related: vim/vim#18639
https://github.com/vim/vim/commit/6be154f5e63d47b9e0e5b709577a8c71aa4e4456
Co-authored-by: Christian Brabandt <cb@256bit.org>
Diffstat:
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
@@ -3669,10 +3669,9 @@ A jump table for the options with a short description can be found at |Q_op|.
'incsearch' 'is' boolean (default on)
global
While typing a search command, show where the pattern, as it was typed
- so far, matches (ignoring {offset} and {address} modifiers). The
- matched string is highlighted. If the pattern is invalid or not
- found, nothing is shown. The screen will be updated often, this is
- only useful on fast terminals.
+ so far, matches. The matched string is highlighted. If the pattern
+ is invalid or not found, nothing is shown. The screen will be updated
+ often, this is only useful on fast terminals.
Note that the match will be shown, but the cursor will return to its
original position when no match is found and when pressing <Esc>. You
still need to finish the search command with <Enter> to move the
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
@@ -3565,10 +3565,9 @@ vim.bo.includeexpr = vim.o.includeexpr
vim.bo.inex = vim.bo.includeexpr
--- While typing a search command, show where the pattern, as it was typed
---- so far, matches (ignoring {offset} and {address} modifiers). The
---- matched string is highlighted. If the pattern is invalid or not
---- found, nothing is shown. The screen will be updated often, this is
---- only useful on fast terminals.
+--- so far, matches. The matched string is highlighted. If the pattern
+--- is invalid or not found, nothing is shown. The screen will be updated
+--- often, this is only useful on fast terminals.
--- Note that the match will be shown, but the cursor will return to its
--- original position when no match is found and when pressing <Esc>. You
--- still need to finish the search command with <Enter> to move the
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
@@ -4701,10 +4701,9 @@ local options = {
defaults = true,
desc = [=[
While typing a search command, show where the pattern, as it was typed
- so far, matches (ignoring {offset} and {address} modifiers). The
- matched string is highlighted. If the pattern is invalid or not
- found, nothing is shown. The screen will be updated often, this is
- only useful on fast terminals.
+ so far, matches. The matched string is highlighted. If the pattern
+ is invalid or not found, nothing is shown. The screen will be updated
+ often, this is only useful on fast terminals.
Note that the match will be shown, but the cursor will return to its
original position when no match is found and when pressing <Esc>. You
still need to finish the search command with <Enter> to move the