commit dabd7ef906a2c142dd49afd30fa258ef33cbf57a
parent a4ebea18f1acb7c3069540f06361436b9675e3ab
Author: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 6 Oct 2024 08:02:30 +0800
Merge pull request #30684 from zeertzjq/vim-738ebfe
vim-patch: doc updates
Diffstat:
11 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
@@ -449,13 +449,13 @@ The 'wildignorecase' option can be set to ignore case in filenames. For
completing other texts (e.g. command names), the 'ignorecase' option is used
instead (fuzzy matching always ignores case, however).
-If you like tcsh's autolist completion, you can use this mapping:
+If you like tcsh's autolist completion, you can use this mapping: >
:cnoremap X <C-L><C-D>
(Where X is the command key to use, <C-L> is CTRL-L and <C-D> is CTRL-D)
This will find the longest match and then list all matching files.
If you like tcsh's autolist completion, you can use the 'wildmode' option to
-emulate it. For example, this mimics autolist=ambiguous:
+emulate it. For example, this mimics autolist=ambiguous: >
:set wildmode=longest,list
This will find the longest match with the first 'wildchar', then list all
matching files with the next.
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
@@ -116,7 +116,7 @@ If you really want to reindent when you type 'o', 'O', 'e', '0', '<', '>',
"<!>", respectively, for those keys.
For an emacs-style indent mode where lines aren't indented every time you
-press <Enter> but only if you press <Tab>, I suggest:
+press <Enter> but only if you press <Tab>, I suggest: >
:set cinkeys=0{,0},:,0#,!<Tab>,!^F
You might also want to switch off 'autoindent' then.
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
@@ -688,7 +688,7 @@ The current mode is "-- INSERT --" or "-- REPLACE --", see |'showmode'|. The
command characters are those that you typed but were not used yet.
If you have a slow terminal you can switch off the status messages to speed
-up editing:
+up editing: >
:set nosc noru nosm
If there is an error, an error message will be shown for at least one second
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
@@ -162,9 +162,9 @@ h or *h*
CTRL-H or *CTRL-H* *<BS>*
<BS> [count] characters to the left. |exclusive| motion.
Note: If you prefer <BS> to delete a character, use
- the mapping:
+ the mapping: >
:map CTRL-V<BS> X
- (to enter "CTRL-V<BS>" type the CTRL-V key, followed
+< (to enter "CTRL-V<BS>" type the CTRL-V key, followed
by the <BS> key)
l or *l*
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
@@ -96,9 +96,9 @@ where the cursor was before the global command).
The global command sets both the last used search pattern and the last used
substitute pattern (this is vi compatible). This makes it easy to globally
-replace a string:
+replace a string: >
:g/pat/s//PAT/g
-This replaces all occurrences of "pat" with "PAT". The same can be done with:
+This replaces all occurrences of "pat" with "PAT". The same can be done with: >
:%s/pat/PAT/g
Which is two characters shorter!
@@ -447,7 +447,7 @@ Example: the lines >
\:%,
\n:>,
\fb:-
-are interpreted as if they were given in one line:
+are interpreted as if they were given in one line: >
:set comments=sr:/*,mb:*,el:*/,://,b:#,:%,n:>,fb:-
All leading whitespace characters in the line before a backslash are ignored.
@@ -540,7 +540,7 @@ the runtime path. Example: >
Using a package and loading automatically ~
Let's assume your Nvim files are in "~/.local/share/nvim/site" and you want to
-add a package from a zip archive "/tmp/foopack.zip":
+add a package from a zip archive "/tmp/foopack.zip": >
% mkdir -p ~/.local/share/nvim/site/pack/foo
% cd ~/.local/share/nvim/site/pack/foo
% unzip /tmp/foopack.zip
@@ -589,7 +589,7 @@ If the package has an "after" directory, that directory is added to the end of
Using a single plugin and loading it automatically ~
If you don't have a package but a single plugin, you need to create the extra
-directory level:
+directory level: >
% mkdir -p ~/.local/share/nvim/site/pack/foo/start/foobar
% cd ~/.local/share/nvim/site/pack/foo/start/foobar
% unzip /tmp/someplugin.zip
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
@@ -776,7 +776,7 @@ them before the Vim word list is made. The tools for this can be found in the
The format for the affix and word list files is based on what Myspell uses
(the spell checker of Mozilla and OpenOffice.org). A description can be found
here:
- https://lingucomponent.openoffice.org/affix.readme ~
+ https://lingucomponent.openoffice.org/affix.readme
Note that affixes are case sensitive, this isn't obvious from the description.
Vim supports quite a few extras. They are described below |spell-affix-vim|.
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
@@ -1723,7 +1723,7 @@ optionality will be discontinued.
JSON *json.vim* *ft-json-syntax* *g:vim_json_conceal*
- *g:vim_json_warnings*
+ *g:vim_json_warnings*
The json syntax file provides syntax highlighting with conceal support by
default. To disable concealment: >
diff --git a/runtime/doc/usr_29.txt b/runtime/doc/usr_29.txt
@@ -34,7 +34,7 @@ following command: >
"ctags" is a separate program. Most Unix systems already have it installed.
If you do not have it yet, you can find Universal ctags at:
- https://ctags.io ~
+ https://ctags.io
Universal ctags is preferred, Exuberant ctags is no longer being developed.
diff --git a/runtime/doc/usr_toc.txt b/runtime/doc/usr_toc.txt
@@ -2,7 +2,7 @@
VIM USER MANUAL - by Bram Moolenaar
- Table Of Contents *user-manual* *usr*
+ Table Of Contents *user-manual* *usr*
==============================================================================
Overview
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
@@ -78,10 +78,9 @@ ga Print the ascii value of the character under the
If the character can be inserted as a digraph, also
output the two characters that can be used to create
the character:
- <ö> 246, Hex 00f6, Oct 366, Digr o: ~
+ <ö> 246, Hex 00f6, Oct 366, Digr o: ~
This shows you can type CTRL-K o : to insert ö.
-
*g8*
g8 Print the hex values of the bytes used in the
character under the cursor, assuming it is in |UTF-8|
diff --git a/runtime/syntax/help.vim b/runtime/syntax/help.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: Vim help file
" Maintainer: The Vim Project <https://github.com/vim/vim>
-" Last Change: 2023 Aug 10
+" Last Change: 2024 Oct 05
" Former Maintainer: Bram Moolenaar <Bram@vim.org>
" Quit when a (custom) syntax file was already loaded
@@ -60,10 +60,14 @@ syn match helpSpecial "\<N\.\s"me=e-2
syn match helpSpecial "(N\>"ms=s+1
syn match helpSpecial "\[N]"
-" avoid highlighting N N in help.txt
+" avoid highlighting N N in quickref.txt
syn match helpSpecial "N N"he=s+1
syn match helpSpecial "Nth"me=e-2
syn match helpSpecial "N-1"me=e-2
+" highlighting N of cinoptions-values in indent.txt
+syn match helpSpecial "^\t-\?\zsNs\?\s"me=s+1
+" highlighting N of cinoptions-values in indent.txt
+syn match helpSpecial "^\t[>enf{}^L:=lbghNEpti+cC/(uUwWkmMjJ)*#P]N\s"ms=s+2,me=e-1
syn match helpSpecial "{[-_a-zA-Z0-9'"*+/:%#=[\]<>.,]\+}"
syn match helpSpecial "\s\[[-a-z^A-Z0-9_]\{2,}]"ms=s+1
syn match helpSpecial "<[-a-zA-Z0-9_]\+>"
