Skip to content

Commit

Permalink
Merge remote-tracking branch 'vim/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
ychin committed Oct 15, 2023
2 parents 8406cbc + f5a94d5 commit 35f8af5
Show file tree
Hide file tree
Showing 101 changed files with 3,704 additions and 812 deletions.
16 changes: 9 additions & 7 deletions runtime/doc/builtin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3930,6 +3930,8 @@ getmousepos() *getmousepos()*
wincol column inside "winid"
line text line inside "winid"
column text column inside "winid"
coladd offset (in screen columns) from the
start of the clicked char
All numbers are 1-based.

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


*E1520*
The conversion specifiers and their meanings are:

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

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


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

If buffer line {lnum} is an empty line, 0 is returned.

If {col} is greater than the last virtual column in line
{lnum}, then the byte index of the character at the last
virtual column is returned.
Expand Down
26 changes: 19 additions & 7 deletions runtime/doc/cmdline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,11 @@ CTRL-SHIFT-Q Works just like CTRL-V, unless |modifyOtherKeys| is active,
In the GUI the |key-notation| is inserted without simplifying.

*c_<Left>* *c_Left*
<Left> cursor left
<Left> cursor left. See 'wildmenu' for behavior during wildmenu
completion mode.
*c_<Right>* *c_Right*
<Right> cursor right
<Right> cursor right. See 'wildmenu' for behavior during wildmenu
completion mode.
*c_<S-Left>*
<S-Left> or <C-Left> *c_<C-Left>*
cursor one WORD left
Expand All @@ -102,7 +104,8 @@ CTRL-SHIFT-Q Works just like CTRL-V, unless |modifyOtherKeys| is active,
CTRL-B or <Home> *c_CTRL-B* *c_<Home>* *c_Home*
cursor to beginning of command-line
CTRL-E or <End> *c_CTRL-E* *c_<End>* *c_End*
cursor to end of command-line
cursor to end of command-line. See 'wildmenu' for behavior
during wildmenu completion mode.

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

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

*c_<Up>* *c_Up*
<Up> recall older command-line from history, whose beginning
matches the current command-line (see below).
matches the current command-line (see below). See 'wildmenu'
for behavior during wildmenu completion mode.
{not available when compiled without the |+cmdline_hist|
feature}
*c_<Down>* *c_Down*
<Down> recall more recent command-line from history, whose beginning
matches the current command-line (see below).
matches the current command-line (see below). See 'wildmenu'
for behavior during wildmenu completion mode.
{not available when compiled without the |+cmdline_hist|
feature}

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

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

The 'wildignorecase' option can be set to ignore case in filenames.

The 'wildmenu' option can be set to show the matches just above the command
line.

The 'wildoptions' option provides additional configuration to use a popup menu
for 'wildmenu', and to use fuzzy matching.

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:
: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)
Expand Down
8 changes: 6 additions & 2 deletions runtime/doc/if_pyth.txt
Original file line number Diff line number Diff line change
Expand Up @@ -754,8 +754,10 @@ you can use Vim without this file.
MS-Windows ~

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

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

==============================================================================
10. Python 3 *python3*
Expand Down
16 changes: 16 additions & 0 deletions runtime/doc/index.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1112,6 +1112,22 @@ tag command action in Command-line editing mode ~
|c_<Insert>| <Insert> toggle insert/overstrike mode
|c_<LeftMouse>| <LeftMouse> cursor at mouse click

commands in wildmenu mode (see 'wildmenu')

<Up> move up to parent / select the previous match
<Down> move down to submenu / select the next match
<Left> select the previous match / move up to parent
<Right> select the next match / move down to submenu
<CR> move into submenu when doing menu completion
other stop completion and insert the typed character

commands in wildmenu mode with 'wildoptions' set to "pum"

CTRL-E stop completion and go back to original text
CTRL-Y accept selected match and stop completion
<PageUp> select a match several entries back
<PageDown> select a match several entries forward

==============================================================================
5. Terminal-Job mode *terminal-job-index*

Expand Down
57 changes: 39 additions & 18 deletions runtime/doc/options.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*options.txt* For Vim version 9.0. Last change: 2023 Aug 15
*options.txt* For Vim version 9.0. Last change: 2023 Oct 14


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -192,10 +192,27 @@ To include white space in a string option value it has to be preceded with a
backslash. To include a backslash you have to use two. Effectively this
means that the number of backslashes in an option value is halved (rounded
down).
In options 'path', 'cdpath', and 'tags', spaces have to be preceded with three
backslashes instead for compatibility with version 3.0 where the options can
be separated by either commas or spaces.
Comma-separated options like 'backupdir' and 'tags' will also require commas
to be escaped with two backslashes, whereas this is not needed for
non-comma-separated ones like 'makeprg'.
When setting options using |:let| and |literal-string|, you need to use one
fewer layer of backslash.
A few examples: >
:set tags=tags\ /usr/tags results in "tags /usr/tags"
:set tags=tags\\,file results in "tags\,file"
:set tags=tags\\\ file results in "tags\ file"
:set makeprg=make\ file results in "make file"
:let &makeprg='make file' (same as above)
:set makeprg=make\\\ file results in "make\ file"
:set tags=tags\ /usr/tags results in "tags" and "/usr/tags"
:set tags=tags\\\ file results in "tags file"
:let &tags='tags\ file' (same as above)
:set makeprg=make,file results in "make,file"
:set makeprg=make\\,file results in "make\,file"
:set tags=tags,file results in "tags" and "file"
:set tags=tags\\,file results in "tags,file"
:let &tags='tags\,file' (same as above)
The "|" character separates a ":set" command from a following command. To
include the "|" in the option value, use "\|" instead. This example sets the
Expand Down Expand Up @@ -4517,8 +4534,8 @@ A jump table for the options with a short description can be found at |Q_op|.
*'ignorecase'* *'ic'* *'noignorecase'* *'noic'*
'ignorecase' 'ic' boolean (default off)
global
Ignore case in search patterns. Also used when searching in the tags
file.
Ignore case in search patterns, |cmdline-completion|, when
searching in the tags file, and non-|Vim9| |expr-==|.
Also see 'smartcase' and 'tagcase'.
Can be overruled by using "\c" or "\C" in the pattern, see
|/ignorecase|.
Expand Down Expand Up @@ -5599,6 +5616,7 @@ A jump table for the options with a short description can be found at |Q_op|.
Increasing this limit above 200 also changes the maximum for Ex
command recursion, see |E169|.
See also |:function|.
Also used for maximum depth of callback functions.

*'maxmapdepth'* *'mmd'* *E223*
'maxmapdepth' 'mmd' number (default 1000)
Expand Down Expand Up @@ -8344,8 +8362,8 @@ A jump table for the options with a short description can be found at |Q_op|.
|+emacs_tags|: "./tags,./TAGS,tags,TAGS")
global or local to buffer |global-local|
Filenames for the tag command, separated by spaces or commas. To
include a space or comma in a file name, precede it with a backslash
(see |option-backslash| about including spaces and backslashes).
include a space or comma in a file name, precede it with backslashes
(see |option-backslash| about including spaces/commas and backslashes).
When a file name starts with "./", the '.' is replaced with the path
of the current file. But only when the 'd' flag is not included in
'cpoptions'. Environment variables are expanded |:set_env|. Also see
Expand Down Expand Up @@ -9441,29 +9459,32 @@ A jump table for the options with a short description can be found at |Q_op|.
as needed.
The "wildmenu" mode is abandoned when a key is hit that is not used
for selecting a completion.
While the "wildmenu" is active, not using the popup menu, the
following keys have special meanings:

<Left> <Right> - select previous/next match (like CTRL-P/CTRL-N)
<Down> - in filename/menu name completion: move into a
subdirectory or submenu.
While the "wildmenu" is active, the following keys have special
meanings:
CTRL-P - go to the previous entry
CTRL-N - go to the next entry
<CR> - in menu completion, when the cursor is just after a
dot: move into a submenu.

When not using the popup menu for command line completion, the
following keys have special meanings:
<Left> <Right> - select previous/next match (like CTRL-P/CTRL-N)
<Up> - in filename/menu name completion: move up into
parent directory or parent menu.
<Down> - in filename/menu name completion: move into a
subdirectory or submenu.

When using the popup menu for command line completion, the following
keys have special meanings:
<Down> - select next match (like CTRL-N)
<Up> <Down> - select previous/next match (like CTRL-P/CTRL-N)
<PageUp> - select a match several entries back
<PageDown> - select a match several entries further
<Left> - in filename/menu name completion: move up into
parent directory or parent menu.
<Right> - in filename/menu name completion: move into a
subdirectory or submenu.
<Up> - select previous match (like CTRL-P)
CTRL-E - end completion, go back to what was there before
selecting a match.
CTRL-N - go to the next entry
CTRL-P - go to the previous entry
CTRL-Y - accept the currently selected match and stop
completion.

Expand Down
1 change: 0 additions & 1 deletion runtime/doc/tags
Original file line number Diff line number Diff line change
Expand Up @@ -4569,7 +4569,6 @@ E1508 editing.txt /*E1508*
E1509 editing.txt /*E1509*
E151 helphelp.txt /*E151*
E152 helphelp.txt /*E152*
E1520 builtin.txt /*E1520*
E153 helphelp.txt /*E153*
E154 helphelp.txt /*E154*
E155 sign.txt /*E155*
Expand Down
18 changes: 11 additions & 7 deletions runtime/doc/vim9class.txt
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,9 @@ prefix when defining the method: >
*E1373*
A class extending the abstract class must implement all the abstract methods.
The signature (arguments, argument types and return type) must be exactly the
same. Class methods in an abstract class can also be abstract methods.
same. If the return type of a method is a class, then that class or one of
its subclasses can be used in the extended method. Class methods in an
abstract class can also be abstract methods.

==============================================================================

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

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

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

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

{not implemented yet}

A type definition is giving a name to a type specification. For Example: >
:type ListOfStrings list<string>
TODO: more explanation

==============================================================================

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

{not implemented yet}

An enum is a type that can have one of a list of values. Example: >
:enum Color
Expand All @@ -759,8 +765,6 @@ An enum is a type that can have one of a list of values. Example: >
Black
:endenum
TODO: more explanation

==============================================================================

Expand Down
2 changes: 1 addition & 1 deletion runtime/doc/xxd-fr.1
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Convertit en binaires plut
Cette option écrit les octets comme une séquence de "1" et de "0" au lieu
d'une conversion en hexadécimal traditionnel. Chaque ligne est précédée par un
numéro de ligne en hexadécimal et suivie de la représentation ASCII (ou
EBCDIC) correspondante. Les options \-r, \-p, \-i ne fonctionnent pas dans ce
EBCDIC) correspondante. Les options \-p, \-i ne fonctionnent pas dans ce
mode.
.TP
.IR "\-c cols " | " \-cols cols"
Expand Down
2 changes: 1 addition & 1 deletion runtime/doc/xxd-fr.UTF-8.1
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Convertit en binaires plutôt qu'en hexadécimal.
Cette option écrit les octets comme une séquence de "1" et de "0" au lieu
d'une conversion en hexadécimal traditionnel. Chaque ligne est précédée par un
numéro de ligne en hexadécimal et suivie de la représentation ASCII (ou
EBCDIC) correspondante. Les options \-r, \-p, \-i ne fonctionnent pas dans ce
EBCDIC) correspondante. Les options \-p, \-i ne fonctionnent pas dans ce
mode.
.TP
.IR "\-c cols " | " \-cols cols"
Expand Down
8 changes: 5 additions & 3 deletions runtime/doc/xxd-it.1
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Richiesta di omissione: Un singolo '*' rimpiazza righe a zeri binari. Default: o
Richiesta di un'immagine binaria (cifre binarie), invece che esadecimale.
Quest'opzione scrive un byte come otto cifre "1" e "0" invece di usare i
numeri esadecimali. Ogni riga è preceduta da un indirizzo in esadecimale e
seguita da una decodifica ASCII (o EBCDIC). Le opzioni \-r, \-p, \-i,
seguita da una decodifica ASCII (o EBCDIC). Le opzioni \-p, \-i,
specificabili dalla riga comando, non funzionano in questo modo.
.TP
.IR "\-c colonne " | " \-cols colonne"
Expand Down Expand Up @@ -131,9 +131,11 @@ Ricostruisce: converte (o mette una patch) da immagine esadecimale, a file binar
Se non scrive sullo `standard output', xxd scrive nel file di output in maniera
continua, senza interruzioni. Usare la combinazione
.I \-r \-p
per leggere dump in stile esadecimale semplice, senza l'informazione del numero
per leggere un dump in stile esadecimale semplice, senza l'informazione del numero
di riga e senza un particolare tracciato di colonna. Spazi o righe vuote
possono essere presenti [e vengono ignorati].
possono essere presenti dappertutto [e vengono ignorati]. Usare la combinazione
.I \-r \-b
per leggere un dump binario, invece che un dump esadecimale.
.TP
.IR \-R " "[quando]
Nell'output i valori esadecimali e i caratteri corrispondenti hanno entrambi
Expand Down
Loading

0 comments on commit 35f8af5

Please sign in to comment.