aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2024-06-19 08:24:29 +0800
committerGitHub <noreply@github.com>2024-06-19 08:24:29 +0800
commitb381b2d529741ddd4f3664959640917a10cd91b5 (patch)
tree4c606a997f28a74b531ab2888e2f59eac5329d70 /runtime
parenta2d510e1015d57f28ab20c5d2897527cae15b9c4 (diff)
parenta2a3e8412e6d4e9a952c57a5298016cae8bf5229 (diff)
downloadrneovim-b381b2d529741ddd4f3664959640917a10cd91b5.tar.gz
rneovim-b381b2d529741ddd4f3664959640917a10cd91b5.tar.bz2
rneovim-b381b2d529741ddd4f3664959640917a10cd91b5.zip
Merge pull request #29404 from zeertzjq/vim-8.2.4724
vim-patch:8.2.{4724,5047}: make CurSearch behavior match Vim
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/news.txt2
-rw-r--r--runtime/doc/syntax.txt5
-rw-r--r--runtime/doc/vim_diff.txt2
3 files changed, 5 insertions, 4 deletions
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 4f9f0248df..840f860e3f 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -47,6 +47,8 @@ EDITOR
• The order in which signs are placed was changed. Higher priority signs will
now appear left of lower priority signs.
+• |hl-CurSearch| now behaves the same as Vim and no longer updates on every
+ cursor movement.
EVENTS
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index e73d5d442f..afc230e112 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -4969,8 +4969,9 @@ ColorColumn Used for the columns set with 'colorcolumn'.
Conceal Placeholder characters substituted for concealed
text (see 'conceallevel').
*hl-CurSearch*
-CurSearch Used for highlighting a search pattern under the cursor
- (see 'hlsearch').
+CurSearch Current match for the last search pattern (see 'hlsearch').
+ Note: This is correct after a search, but may get outdated if
+ changes are made or the screen is redrawn.
*hl-Cursor* *hl-lCursor*
Cursor Character under the cursor.
lCursor Character under the cursor when |language-mapping|
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index a6f08402f6..a51ffcf004 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -539,8 +539,6 @@ Functions:
Highlight groups:
- |hl-ColorColumn|, |hl-CursorColumn| are lower priority than most other
groups
-- |hl-CurSearch| highlights match under cursor instead of last match found
- using |n| or |N|
- |hl-CursorLine| is low-priority unless foreground color is set
- |hl-VertSplit| superseded by |hl-WinSeparator|
- Highlight groups names are allowed to contain `@` characters.