aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2024-09-27 07:22:54 +0800
committerGitHub <noreply@github.com>2024-09-27 07:22:54 +0800
commit98d1c0ebef77ba2d96f1203ad504b8ae08ebdab0 (patch)
tree1ce42c8f44934bf4af1864b10e37e0aa50186b25
parentf2fa4ca97ea3812dba78820323a1ccbf58921b40 (diff)
parent7860fd98ae148305c36d808452b551a517f9939b (diff)
downloadrneovim-98d1c0ebef77ba2d96f1203ad504b8ae08ebdab0.tar.gz
rneovim-98d1c0ebef77ba2d96f1203ad504b8ae08ebdab0.tar.bz2
rneovim-98d1c0ebef77ba2d96f1203ad504b8ae08ebdab0.zip
Merge pull request #30530 from zeertzjq/vim-d9af78b
vim-patch: doc updates
-rw-r--r--runtime/doc/map.txt2
-rw-r--r--runtime/doc/options.txt15
2 files changed, 9 insertions, 8 deletions
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 3bdf8c1e13..7fd1f3bfbb 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1684,7 +1684,7 @@ The valid escape sequences are
nothing. Supported modifiers are |:aboveleft|, |:belowright|,
|:botright|, |:browse|, |:confirm|, |:hide|, |:horizontal|,
|:keepalt|, |:keepjumps|, |:keepmarks|, |:keeppatterns|,
- |:leftabove|, |:lockmarks|, |:noautocmd|, |:noswapfile|
+ |:leftabove|, |:lockmarks|, |:noautocmd|, |:noswapfile|,
|:rightbelow|, |:sandbox|, |:silent|, |:tab|, |:topleft|,
|:unsilent|, |:verbose|, and |:vertical|.
Note that |:filter| is not supported.
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index cf6fb000f4..53847cf36d 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -333,13 +333,14 @@ between string and number-based options.
options which are different from the default.
For buffer-local and window-local options:
- Command global value local value ~
- :set option=value set set
- :setlocal option=value - set
-:setglobal option=value set -
- :set option? - display
- :setlocal option? - display
-:setglobal option? display -
+ Command global value local value condition ~
+ :set option=value set set
+ :setlocal option=value - set
+:setglobal option=value set -
+ :set option? - display local value is set
+ :set option? display - local value is not set
+ :setlocal option? - display
+:setglobal option? display -
Global options with a local value *global-local*