Skip to content

Commit 35f8af5

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 8406cbc + f5a94d5 commit 35f8af5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+3704
-812
lines changed

runtime/doc/builtin.txt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3930,6 +3930,8 @@ getmousepos() *getmousepos()*
39303930
wincol column inside "winid"
39313931
line text line inside "winid"
39323932
column text column inside "winid"
3933+
coladd offset (in screen columns) from the
3934+
start of the clicked char
39333935
All numbers are 1-based.
39343936

39353937
If not over a window, e.g. when in the command line, then only
@@ -6692,8 +6694,6 @@ printf({fmt}, {expr1} ...) *printf()*
66926694
precision, the argument(s) to be used must also be specified
66936695
using a {n$} positional argument specifier. See |printf-$|.
66946696

6695-
6696-
*E1520*
66976697
The conversion specifiers and their meanings are:
66986698

66996699
*printf-d* *printf-b* *printf-B* *printf-o*
@@ -6887,11 +6887,11 @@ printf({fmt}, {expr1} ...) *printf()*
68876887
%1$d at width %2$d is: %01$*2$.3$d
68886888

68896889
*E1507*
6890-
This internal error indicates that the logic to
6891-
parse a positional format error ran into a problem
6892-
that couldn't be otherwise reported. Please file a
6893-
bug against vim if you run into this, copying the
6894-
exact format string and parameters that were used.
6890+
This internal error indicates that the logic to parse a
6891+
positional format argument ran into a problem that couldn't be
6892+
otherwise reported. Please file a bug against Vim if you run
6893+
into this, copying the exact format string and parameters that
6894+
were used.
68956895

68966896

68976897
prompt_getprompt({buf}) *prompt_getprompt()*
@@ -10402,6 +10402,8 @@ virtcol2col({winid}, {lnum}, {col}) *virtcol2col()*
1040210402
character in window {winid} at buffer line {lnum} and virtual
1040310403
column {col}.
1040410404

10405+
If buffer line {lnum} is an empty line, 0 is returned.
10406+
1040510407
If {col} is greater than the last virtual column in line
1040610408
{lnum}, then the byte index of the character at the last
1040710409
virtual column is returned.

runtime/doc/cmdline.txt

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,11 @@ CTRL-SHIFT-Q Works just like CTRL-V, unless |modifyOtherKeys| is active,
9090
In the GUI the |key-notation| is inserted without simplifying.
9191

9292
*c_<Left>* *c_Left*
93-
<Left> cursor left
93+
<Left> cursor left. See 'wildmenu' for behavior during wildmenu
94+
completion mode.
9495
*c_<Right>* *c_Right*
95-
<Right> cursor right
96+
<Right> cursor right. See 'wildmenu' for behavior during wildmenu
97+
completion mode.
9698
*c_<S-Left>*
9799
<S-Left> or <C-Left> *c_<C-Left>*
98100
cursor one WORD left
@@ -102,7 +104,8 @@ CTRL-SHIFT-Q Works just like CTRL-V, unless |modifyOtherKeys| is active,
102104
CTRL-B or <Home> *c_CTRL-B* *c_<Home>* *c_Home*
103105
cursor to beginning of command-line
104106
CTRL-E or <End> *c_CTRL-E* *c_<End>* *c_End*
105-
cursor to end of command-line
107+
cursor to end of command-line. See 'wildmenu' for behavior
108+
during wildmenu completion mode.
106109

107110
*c_<LeftMouse>*
108111
<LeftMouse> Move the cursor to the position of the mouse click.
@@ -237,6 +240,7 @@ CTRL-\ e {expr} *c_CTRL-\_e*
237240
CTRL-Y When there is a modeless selection, copy the selection into
238241
the clipboard. |modeless-selection|
239242
If there is no selection CTRL-Y is inserted as a character.
243+
See 'wildmenu' for behavior during wildmenu completion mode.
240244

241245
CTRL-M or CTRL-J *c_CTRL-M* *c_CTRL-J* *c_<NL>* *c_<CR>* *c_CR*
242246
<CR> or <NL> start entered command
@@ -252,12 +256,14 @@ CTRL-C quit command-line without executing
252256

253257
*c_<Up>* *c_Up*
254258
<Up> recall older command-line from history, whose beginning
255-
matches the current command-line (see below).
259+
matches the current command-line (see below). See 'wildmenu'
260+
for behavior during wildmenu completion mode.
256261
{not available when compiled without the |+cmdline_hist|
257262
feature}
258263
*c_<Down>* *c_Down*
259264
<Down> recall more recent command-line from history, whose beginning
260-
matches the current command-line (see below).
265+
matches the current command-line (see below). See 'wildmenu'
266+
for behavior during wildmenu completion mode.
261267
{not available when compiled without the |+cmdline_hist|
262268
feature}
263269

@@ -381,6 +387,7 @@ When editing the command-line, a few commands can be used to complete the
381387
word before the cursor. This is available for:
382388

383389
- Command names: At the start of the command-line.
390+
- |++opt| values.
384391
- Tags: Only after the ":tag" command.
385392
- File names: Only after a command that accepts a file name or a setting for
386393
an option that can be set to a file name. This is called file name
@@ -463,11 +470,16 @@ When repeating 'wildchar' or CTRL-N you cycle through the matches, eventually
463470
ending up back to what was typed. If the first match is not what you wanted,
464471
you can use <S-Tab> or CTRL-P to go straight back to what you typed.
465472

466-
The 'wildignorecase' option can be set to ignore case in filenames.
467-
468473
The 'wildmenu' option can be set to show the matches just above the command
469474
line.
470475

476+
The 'wildoptions' option provides additional configuration to use a popup menu
477+
for 'wildmenu', and to use fuzzy matching.
478+
479+
The 'wildignorecase' option can be set to ignore case in filenames. For
480+
completing other texts (e.g. command names), the 'ignorecase' option is used
481+
instead (fuzzy matching always ignores case, however).
482+
471483
If you like tcsh's autolist completion, you can use this mapping:
472484
:cnoremap X <C-L><C-D>
473485
(Where X is the command key to use, <C-L> is CTRL-L and <C-D> is CTRL-D)

runtime/doc/if_pyth.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -754,8 +754,10 @@ you can use Vim without this file.
754754
MS-Windows ~
755755

756756
To use the Python interface the Python DLL must be in your search path. In a
757-
console window type "path" to see what directories are used. The 'pythondll'
758-
or 'pythonthreedll' option can be also used to specify the Python DLL.
757+
console window type "path" to see what directories are used. If the DLL is
758+
not found in your search path, Vim will check the registry to find the path
759+
where Python is installed. The 'pythondll' or 'pythonthreedll' option can be
760+
also used to specify the Python DLL.
759761

760762
The name of the DLL should match the Python version Vim was compiled with.
761763
Currently the name for Python 2 is "python27.dll", that is for Python 2.7.
@@ -782,6 +784,8 @@ and failures. With Stable ABI, this restriction is relaxed, and any Python 3
782784
library with version of at least |v:python3_version| will work. See
783785
|has-python| for how to check if Stable ABI is supported, or see if version
784786
output includes |+python3/dyn-stable|.
787+
On MS-Windows, 'pythonthreedll' will be set to "python3.dll". When searching
788+
the DLL from the registry, Vim will search the latest version of Python.
785789

786790
==============================================================================
787791
10. Python 3 *python3*

runtime/doc/index.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,6 +1112,22 @@ tag command action in Command-line editing mode ~
11121112
|c_<Insert>| <Insert> toggle insert/overstrike mode
11131113
|c_<LeftMouse>| <LeftMouse> cursor at mouse click
11141114

1115+
commands in wildmenu mode (see 'wildmenu')
1116+
1117+
<Up> move up to parent / select the previous match
1118+
<Down> move down to submenu / select the next match
1119+
<Left> select the previous match / move up to parent
1120+
<Right> select the next match / move down to submenu
1121+
<CR> move into submenu when doing menu completion
1122+
other stop completion and insert the typed character
1123+
1124+
commands in wildmenu mode with 'wildoptions' set to "pum"
1125+
1126+
CTRL-E stop completion and go back to original text
1127+
CTRL-Y accept selected match and stop completion
1128+
<PageUp> select a match several entries back
1129+
<PageDown> select a match several entries forward
1130+
11151131
==============================================================================
11161132
5. Terminal-Job mode *terminal-job-index*
11171133

runtime/doc/options.txt

Lines changed: 39 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 9.0. Last change: 2023 Aug 15
1+
*options.txt* For Vim version 9.0. Last change: 2023 Oct 14
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -192,10 +192,27 @@ To include white space in a string option value it has to be preceded with a
192192
backslash. To include a backslash you have to use two. Effectively this
193193
means that the number of backslashes in an option value is halved (rounded
194194
down).
195+
In options 'path', 'cdpath', and 'tags', spaces have to be preceded with three
196+
backslashes instead for compatibility with version 3.0 where the options can
197+
be separated by either commas or spaces.
198+
Comma-separated options like 'backupdir' and 'tags' will also require commas
199+
to be escaped with two backslashes, whereas this is not needed for
200+
non-comma-separated ones like 'makeprg'.
201+
When setting options using |:let| and |literal-string|, you need to use one
202+
fewer layer of backslash.
195203
A few examples: >
196-
:set tags=tags\ /usr/tags results in "tags /usr/tags"
197-
:set tags=tags\\,file results in "tags\,file"
198-
:set tags=tags\\\ file results in "tags\ file"
204+
:set makeprg=make\ file results in "make file"
205+
:let &makeprg='make file' (same as above)
206+
:set makeprg=make\\\ file results in "make\ file"
207+
:set tags=tags\ /usr/tags results in "tags" and "/usr/tags"
208+
:set tags=tags\\\ file results in "tags file"
209+
:let &tags='tags\ file' (same as above)
210+
211+
:set makeprg=make,file results in "make,file"
212+
:set makeprg=make\\,file results in "make\,file"
213+
:set tags=tags,file results in "tags" and "file"
214+
:set tags=tags\\,file results in "tags,file"
215+
:let &tags='tags\,file' (same as above)
199216
200217
The "|" character separates a ":set" command from a following command. To
201218
include the "|" in the option value, use "\|" instead. This example sets the
@@ -4517,8 +4534,8 @@ A jump table for the options with a short description can be found at |Q_op|.
45174534
*'ignorecase'* *'ic'* *'noignorecase'* *'noic'*
45184535
'ignorecase' 'ic' boolean (default off)
45194536
global
4520-
Ignore case in search patterns. Also used when searching in the tags
4521-
file.
4537+
Ignore case in search patterns, |cmdline-completion|, when
4538+
searching in the tags file, and non-|Vim9| |expr-==|.
45224539
Also see 'smartcase' and 'tagcase'.
45234540
Can be overruled by using "\c" or "\C" in the pattern, see
45244541
|/ignorecase|.
@@ -5599,6 +5616,7 @@ A jump table for the options with a short description can be found at |Q_op|.
55995616
Increasing this limit above 200 also changes the maximum for Ex
56005617
command recursion, see |E169|.
56015618
See also |:function|.
5619+
Also used for maximum depth of callback functions.
56025620

56035621
*'maxmapdepth'* *'mmd'* *E223*
56045622
'maxmapdepth' 'mmd' number (default 1000)
@@ -8344,8 +8362,8 @@ A jump table for the options with a short description can be found at |Q_op|.
83448362
|+emacs_tags|: "./tags,./TAGS,tags,TAGS")
83458363
global or local to buffer |global-local|
83468364
Filenames for the tag command, separated by spaces or commas. To
8347-
include a space or comma in a file name, precede it with a backslash
8348-
(see |option-backslash| about including spaces and backslashes).
8365+
include a space or comma in a file name, precede it with backslashes
8366+
(see |option-backslash| about including spaces/commas and backslashes).
83498367
When a file name starts with "./", the '.' is replaced with the path
83508368
of the current file. But only when the 'd' flag is not included in
83518369
'cpoptions'. Environment variables are expanded |:set_env|. Also see
@@ -9441,29 +9459,32 @@ A jump table for the options with a short description can be found at |Q_op|.
94419459
as needed.
94429460
The "wildmenu" mode is abandoned when a key is hit that is not used
94439461
for selecting a completion.
9444-
While the "wildmenu" is active, not using the popup menu, the
9445-
following keys have special meanings:
9446-
9447-
<Left> <Right> - select previous/next match (like CTRL-P/CTRL-N)
9448-
<Down> - in filename/menu name completion: move into a
9449-
subdirectory or submenu.
9462+
While the "wildmenu" is active, the following keys have special
9463+
meanings:
9464+
CTRL-P - go to the previous entry
9465+
CTRL-N - go to the next entry
94509466
<CR> - in menu completion, when the cursor is just after a
94519467
dot: move into a submenu.
9468+
9469+
When not using the popup menu for command line completion, the
9470+
following keys have special meanings:
9471+
<Left> <Right> - select previous/next match (like CTRL-P/CTRL-N)
94529472
<Up> - in filename/menu name completion: move up into
94539473
parent directory or parent menu.
9474+
<Down> - in filename/menu name completion: move into a
9475+
subdirectory or submenu.
94549476

94559477
When using the popup menu for command line completion, the following
94569478
keys have special meanings:
9457-
<Down> - select next match (like CTRL-N)
9479+
<Up> <Down> - select previous/next match (like CTRL-P/CTRL-N)
9480+
<PageUp> - select a match several entries back
9481+
<PageDown> - select a match several entries further
94589482
<Left> - in filename/menu name completion: move up into
94599483
parent directory or parent menu.
94609484
<Right> - in filename/menu name completion: move into a
94619485
subdirectory or submenu.
9462-
<Up> - select previous match (like CTRL-P)
94639486
CTRL-E - end completion, go back to what was there before
94649487
selecting a match.
9465-
CTRL-N - go to the next entry
9466-
CTRL-P - go to the previous entry
94679488
CTRL-Y - accept the currently selected match and stop
94689489
completion.
94699490

runtime/doc/tags

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4569,7 +4569,6 @@ E1508 editing.txt /*E1508*
45694569
E1509 editing.txt /*E1509*
45704570
E151 helphelp.txt /*E151*
45714571
E152 helphelp.txt /*E152*
4572-
E1520 builtin.txt /*E1520*
45734572
E153 helphelp.txt /*E153*
45744573
E154 helphelp.txt /*E154*
45754574
E155 sign.txt /*E155*

runtime/doc/vim9class.txt

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,9 @@ prefix when defining the method: >
413413
*E1373*
414414
A class extending the abstract class must implement all the abstract methods.
415415
The signature (arguments, argument types and return type) must be exactly the
416-
same. Class methods in an abstract class can also be abstract methods.
416+
same. If the return type of a method is a class, then that class or one of
417+
its subclasses can be used in the extended method. Class methods in an
418+
abstract class can also be abstract methods.
417419

418420
==============================================================================
419421

@@ -548,8 +550,10 @@ is not possible to override them (unlike some other languages).
548550

549551
*E1356* *E1357* *E1358*
550552
Object methods of the base class can be overruled. The signature (arguments,
551-
argument types and return type) must be exactly the same. The method of the
552-
base class can be called by prefixing "super.".
553+
argument types and return type) must be exactly the same. If the return type
554+
of a method is a class, then that class or one of its subclasses can be used
555+
in the extended method. The method of the base class can be called by
556+
prefixing "super.".
553557

554558
*E1377*
555559
The access level of a method (public or private) in a child class should be
@@ -738,17 +742,19 @@ constructor methods.
738742

739743
7. Type definition *Vim9-type* *:type*
740744

745+
{not implemented yet}
746+
741747
A type definition is giving a name to a type specification. For Example: >
742748
743749
:type ListOfStrings list<string>
744750
745-
TODO: more explanation
746-
747751
748752
==============================================================================
749753

750754
8. Enum *Vim9-enum* *:enum* *:endenum*
751755

756+
{not implemented yet}
757+
752758
An enum is a type that can have one of a list of values. Example: >
753759
754760
:enum Color
@@ -759,8 +765,6 @@ An enum is a type that can have one of a list of values. Example: >
759765
Black
760766
:endenum
761767
762-
TODO: more explanation
763-
764768
765769
==============================================================================
766770

runtime/doc/xxd-fr.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Convertit en binaires plut
7070
Cette option écrit les octets comme une séquence de "1" et de "0" au lieu
7171
d'une conversion en hexadécimal traditionnel. Chaque ligne est précédée par un
7272
numéro de ligne en hexadécimal et suivie de la représentation ASCII (ou
73-
EBCDIC) correspondante. Les options \-r, \-p, \-i ne fonctionnent pas dans ce
73+
EBCDIC) correspondante. Les options \-p, \-i ne fonctionnent pas dans ce
7474
mode.
7575
.TP
7676
.IR "\-c cols " | " \-cols cols"

runtime/doc/xxd-fr.UTF-8.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Convertit en binaires plutôt qu'en hexadécimal.
7070
Cette option écrit les octets comme une séquence de "1" et de "0" au lieu
7171
d'une conversion en hexadécimal traditionnel. Chaque ligne est précédée par un
7272
numéro de ligne en hexadécimal et suivie de la représentation ASCII (ou
73-
EBCDIC) correspondante. Les options \-r, \-p, \-i ne fonctionnent pas dans ce
73+
EBCDIC) correspondante. Les options \-p, \-i ne fonctionnent pas dans ce
7474
mode.
7575
.TP
7676
.IR "\-c cols " | " \-cols cols"

runtime/doc/xxd-it.1

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Richiesta di omissione: Un singolo '*' rimpiazza righe a zeri binari. Default: o
6363
Richiesta di un'immagine binaria (cifre binarie), invece che esadecimale.
6464
Quest'opzione scrive un byte come otto cifre "1" e "0" invece di usare i
6565
numeri esadecimali. Ogni riga è preceduta da un indirizzo in esadecimale e
66-
seguita da una decodifica ASCII (o EBCDIC). Le opzioni \-r, \-p, \-i,
66+
seguita da una decodifica ASCII (o EBCDIC). Le opzioni \-p, \-i,
6767
specificabili dalla riga comando, non funzionano in questo modo.
6868
.TP
6969
.IR "\-c colonne " | " \-cols colonne"
@@ -131,9 +131,11 @@ Ricostruisce: converte (o mette una patch) da immagine esadecimale, a file binar
131131
Se non scrive sullo `standard output', xxd scrive nel file di output in maniera
132132
continua, senza interruzioni. Usare la combinazione
133133
.I \-r \-p
134-
per leggere dump in stile esadecimale semplice, senza l'informazione del numero
134+
per leggere un dump in stile esadecimale semplice, senza l'informazione del numero
135135
di riga e senza un particolare tracciato di colonna. Spazi o righe vuote
136-
possono essere presenti [e vengono ignorati].
136+
possono essere presenti dappertutto [e vengono ignorati]. Usare la combinazione
137+
.I \-r \-b
138+
per leggere un dump binario, invece che un dump esadecimale.
137139
.TP
138140
.IR \-R " "[quando]
139141
Nell'output i valori esadecimali e i caratteri corrispondenti hanno entrambi

0 commit comments

Comments
 (0)