aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2022-07-26 11:26:23 +0200
committerGitHub <noreply@github.com>2022-07-26 11:26:23 +0200
commit4cbeedf57bf48a00890349f5b4624737f4f3fce6 (patch)
tree6b14b6d3a8b5918109380925e9ef8b20519840ac /runtime/doc
parent1a07044c1c828edda3e24828782665947fe68049 (diff)
downloadrneovim-4cbeedf57bf48a00890349f5b4624737f4f3fce6.tar.gz
rneovim-4cbeedf57bf48a00890349f5b4624737f4f3fce6.tar.bz2
rneovim-4cbeedf57bf48a00890349f5b4624737f4f3fce6.zip
vim-patch:b529cfbd04c0 (#19501)
Update runtime files https://github.com/vim/vim/commit/b529cfbd04c02e31cfa88f2c8d88b5ff532d4f7d
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/builtin.txt12
-rw-r--r--runtime/doc/ft_sql.txt8
-rw-r--r--runtime/doc/insert.txt18
-rw-r--r--runtime/doc/map.txt21
-rw-r--r--runtime/doc/options.txt2
-rw-r--r--runtime/doc/pi_netrw.txt2
-rw-r--r--runtime/doc/undo.txt10
7 files changed, 39 insertions, 34 deletions
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index df5a636070..668c738e0a 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1885,7 +1885,9 @@ exists({expr}) The result is a Number, which is |TRUE| if {expr} is
To check for a supported command
always check the return value to be 2.
:2match The |:2match| command.
- :3match The |:3match| command.
+ :3match The |:3match| command (but you
+ probably should not use it, it is
+ reserved for internal usage)
#event autocommand defined for this event
#event#pattern autocommand defined for this event and
pattern (the pattern is taken
@@ -4905,8 +4907,10 @@ matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
message will appear and the match will not be added. An ID
is specified as a positive integer (zero excluded). IDs 1, 2
and 3 are reserved for |:match|, |:2match| and |:3match|,
- respectively. If the {id} argument is not specified or -1,
- |matchadd()| automatically chooses a free ID.
+ respectively. 3 is reserved for use by the
+ |matchparen| plugin.
+ If the {id} argument is not specified or -1, |matchadd()|
+ automatically chooses a free ID.
The optional {dict} argument allows for further custom
values. Currently this is used to specify a match specific
@@ -6397,7 +6401,7 @@ searchcount([{options}]) *searchcount()*
" to 1)
let result = searchcount()
<
- The function is useful to add the count to |statusline|: >
+ The function is useful to add the count to 'statusline': >
function! LastSearchCount() abort
let result = searchcount(#{recompute: 0})
if empty(result)
diff --git a/runtime/doc/ft_sql.txt b/runtime/doc/ft_sql.txt
index 6972fe0768..335faf266e 100644
--- a/runtime/doc/ft_sql.txt
+++ b/runtime/doc/ft_sql.txt
@@ -502,7 +502,7 @@ documentation.
Assuming you have followed the dbext-tutorial you can press <C-C>t to
display a list of tables. There is a delay while dbext is creating the table
list. After the list is displayed press <C-W>. This will remove both the
-popup window and the table name already chosen when the list became active. >
+popup window and the table name already chosen when the list became active.
4.3.1 Table Completion: *sql-completion-tables*
@@ -510,7 +510,7 @@ Press <C-C>t to display a list of tables from within the database you
have connected via the dbext plugin.
NOTE: All of the SQL completion popups support typing a prefix before pressing
the key map. This will limit the contents of the popup window to just items
-beginning with those characters. >
+beginning with those characters.
4.3.2 Column Completion: *sql-completion-columns*
@@ -583,13 +583,13 @@ popup a list of columns for the customer table. It does this by looking back
to the beginning of the select statement and finding a list of the tables
specified in the FROM clause. In this case it notes that in the string
"customer c", "c" is an alias for the customer table. The optional "AS"
-keyword is also supported, "customer AS c". >
+keyword is also supported, "customer AS c".
4.3.3 Procedure Completion: *sql-completion-procedures*
Similar to the table list, <C-C>p, will display a list of stored
-procedures stored within the database. >
+procedures stored within the database.
4.3.4 View Completion: *sql-completion-views*
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 27f1fed751..6b0899334b 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -374,10 +374,10 @@ CTRL-G CTRL-J cursor one line down, insert start column *i_CTRL-G_CTRL-J*
<S-ScrollWheelRight> move window one page right *i_<S-ScrollWheelRight>*
CTRL-O execute one command, return to Insert mode *i_CTRL-O*
CTRL-\ CTRL-O like CTRL-O but don't move the cursor *i_CTRL-\_CTRL-O*
-CTRL-G u break undo sequence, start new change *i_CTRL-G_u*
-CTRL-G U don't break undo with next left/right cursor *i_CTRL-G_U*
- movement, if the cursor stays within the
- same the line
+CTRL-G u close undo sequence, start new change *i_CTRL-G_u*
+CTRL-G U don't start a new undo block with the next *i_CTRL-G_U*
+ left/right cursor movement, if the cursor
+ stays within the same line
-----------------------------------------------------------------------
The CTRL-O command sometimes has a side effect: If the cursor was beyond the
@@ -411,8 +411,8 @@ that, with CTRL-O u. Another example: >
:inoremap <CR> <C-]><C-G>u<CR>
-This breaks undo at each line break. It also expands abbreviations before
-this.
+This starts a new undo block at each line break. It also expands
+abbreviations before this.
An example for using CTRL-G U: >
@@ -426,9 +426,9 @@ An example for using CTRL-G U: >
inoremap <expr> <End> repeat('<C-G>U<Right>', col('$') - col('.'))
inoremap ( ()<C-G>U<Left>
-This makes it possible to use the cursor keys in Insert mode, without breaking
-the undo sequence and therefore using |.| (redo) will work as expected.
-Also entering a text like (with the "(" mapping from above):
+This makes it possible to use the cursor keys in Insert mode, without starting
+a new undo block and therefore using |.| (redo) will work as expected. Also
+entering a text like (with the "(" mapping from above):
Lorem ipsum (dolor
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 7e94167e07..1e1f4e46af 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -610,19 +610,20 @@ two bytes 0xc3 0xa1. You don't want the 0xc3 byte to be mapped then or
otherwise it would be impossible to type the รก character.
*<Leader>* *mapleader*
-To define a mapping which uses the "mapleader" variable, the special string
-"<Leader>" can be used. It is replaced with the string value of "mapleader".
-If "mapleader" is not set or empty, a backslash is used instead. Example: >
- :map <Leader>A oanother line<Esc>
+To define a mapping which uses the "g:mapleader" variable, the special string
+"<Leader>" can be used. It is replaced with the string value of
+"g:mapleader". If "g:mapleader" is not set or empty, a backslash is used
+instead. Example: >
+ map <Leader>A oanother line<Esc>
Works like: >
- :map \A oanother line<Esc>
-But after: >
- :let mapleader = ","
+ map \A oanother line<Esc>
+But after:
+ let mapleader = ","
It works like: >
- :map ,A oanother line<Esc>
+ map ,A oanother line<Esc>
-Note that the value of "mapleader" is used at the moment the mapping is
-defined. Changing "mapleader" after that has no effect for already defined
+Note that the value of "g:mapleader" is used at the moment the mapping is
+defined. Changing "g:mapleader" after that has no effect for already defined
mappings.
*<LocalLeader>* *maplocalleader*
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 0f1c2051a6..68723e4889 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3571,7 +3571,7 @@ A jump table for the options with a short description can be found at |Q_op|.
help. (Note that previously setting the global option to the empty
value did this, which is now deprecated.)
When the first character is ":", the command is invoked as a Vim
- command prefixed with [count].
+ Ex command with [count] added as an argument if it is not zero.
When "man" or "man -s" is used, Vim will automatically translate
a [count] for the "K" command to a section number.
See |option-backslash| about including spaces and backslashes.
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index 6f7b53722c..1eaa76264f 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -3917,7 +3917,7 @@ netrw:
* Installed |g:netrw_clipboard| setting
* Installed option bypass for |'guioptions'|
a/A settings
- * Changed popup_beval() to |popup_atcursor|()
+ * Changed popup_beval() to |popup_atcursor()|
in netrw#ErrorMsg (lacygoill). Apparently
popup_beval doesn't reliably close the
popup when the mouse is moved.
diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt
index 67f24103cd..98ab60c7e7 100644
--- a/runtime/doc/undo.txt
+++ b/runtime/doc/undo.txt
@@ -108,13 +108,13 @@ change again. But you can do something like this: >
After this a "u" command will undo the delete command and the previous
change.
- *undo-break*
-To do the opposite, break a change into two undo blocks, in Insert mode use
-CTRL-G u. This is useful if you want an insert command to be undoable in
+ *undo-break* *undo-close-block*
+To do the opposite, use a new undo block for the next change, in Insert mode
+use CTRL-G u. This is useful if you want an insert command to be undoable in
parts. E.g., for each sentence. |i_CTRL-G_u|
-Setting the value of 'undolevels' also breaks undo. Even when the new value
-is equal to the old value: >
+Setting the value of 'undolevels' also closes the undo block. Even when the
+new value is equal to the old value: >
let &undolevels = &undolevels
==============================================================================