aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc/vim_diff.txt
diff options
context:
space:
mode:
authorJosh Rahm <rahm@google.com>2022-09-12 10:52:49 -0600
committerJosh Rahm <rahm@google.com>2022-09-12 10:52:49 -0600
commit4889fe01b9853cf98363ac226f95b524801ff3cc (patch)
tree279d43b86561bf1314fdf1cf5c0c9af6aac76b25 /runtime/doc/vim_diff.txt
parent8fc6e69877f6c15942b4e8fc6ca471e4221d9bae (diff)
parentfd70e2bff2440181f63fe124738cf2a025d1e6a5 (diff)
downloadrneovim-4889fe01b9853cf98363ac226f95b524801ff3cc.tar.gz
rneovim-4889fe01b9853cf98363ac226f95b524801ff3cc.tar.bz2
rneovim-4889fe01b9853cf98363ac226f95b524801ff3cc.zip
Merge remote-tracking branch 'upstream/master' into usermarks
Diffstat (limited to 'runtime/doc/vim_diff.txt')
-rw-r--r--runtime/doc/vim_diff.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 53effa1443..b013e00fe8 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -73,7 +73,7 @@ centralized reference of the differences.
- 'wildmenu' is enabled
- 'wildoptions' defaults to "pum,tagfile"
-- |man.vim| plugin is enabled, so |:Man| is available by default.
+- |man.lua| plugin is enabled, so |:Man| is available by default.
- |matchit| plugin is enabled. To disable it in your config: >
:let loaded_matchit = 1
@@ -390,6 +390,9 @@ Highlight groups:
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 the characters `.` and `@`.
+ It is an error to define a highlight group with a name that doesn't match
+ the regexp `[a-zA-Z0-9_.@]*` (see |group-name|).
Macro/|recording| behavior
Replay of a macro recorded during :lmap produces the same actions as when it