IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:5666fcd0bd79

Browse Source 
Update runtime files.
5666fcd0bd

Do not manually port E290 error message.
Neovim has E5030,E5031 error messages to replace E290.
This commit is contained in:
Jan Edmund Lazo 2021-04-24 23:14:11 -04:00
parent 841bc219d2
commit ae362c2120
No known key found for this signature in database
GPG Key ID: 64915E6E9F735B15
18 changed files with 85 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/doc/cmdline.txt
View File

@ -898,7 +898,7 @@ These modifiers can be given, in this order:
separator is removed. Thus ":p:h" on a directory name results
on the directory name itself (without trailing slash).
When the file name is an absolute path (starts with "/" for
Unix; "x:\" for Windows), that part is not removed.
Unix; "x:\" for Win32), that part is not removed.
When there is no head (path is relative to current directory)
the result is empty.
:t Tail of the file name (last component of the name). Must

34
runtime/doc/editing.txt
View File

@ -298,10 +298,13 @@ CTRL-^ Edit the alternate file. Mostly the alternate file is
*gF*
[count]gF Same as "gf", except if a number follows the file
name, then the cursor is positioned on that line in
the file. The file name and the number must be
separated by a non-filename (see 'isfname') and
non-numeric character. White space between the
filename, the separator and the number are ignored.
the file.
The file name and the number must be separated by a
non-filename (see 'isfname') and non-numeric
character. " line " is also recognized, like it is
used in the output of `:verbose command UserCmd`
White space between the filename, the separator and
the number are ignored.
Examples:
eval.c:10 ~
eval.c @ 20 ~
@ -508,15 +511,16 @@ If you start editing a new file and the 'fileformats' option is not empty
(which is the default), Vim will try to detect whether the lines in the file
are separated by the specified formats. When set to "unix,dos", Vim will
check for lines with a single <NL> (as used on Unix) or by a <CR><NL> pair
(Windows). Only when ALL lines end in <CR><NL>, 'fileformat' is set to "dos",
otherwise it is set to "unix". When 'fileformats' includes "mac", and no <NL>
characters are found in the file, 'fileformat' is set to "mac".
(MS-Windows). Only when ALL lines end in <CR><NL>, 'fileformat' is
set to "dos", otherwise it is set to "unix". When 'fileformats' includes
"mac", and no <NL> characters are found in the file, 'fileformat' is set to
"mac".
If the 'fileformat' option is set to "dos" on non-Windows systems the message
"[dos format]" is shown to remind you that something unusual is happening. On
Windows systems you get the message "[unix format]" if 'fileformat' is set to
"unix". On all systems but the Macintosh you get the message "[mac format]"
if 'fileformat' is set to "mac".
If the 'fileformat' option is set to "dos" on non-MS-Windows systems the
message "[dos format]" is shown to remind you that something unusual is
happening. On MS-Windows systems you get the message "[unix format]" if
'fileformat' is set to "unix". On all systems but the Macintosh you get the
message "[mac format]" if 'fileformat' is set to "mac".
If the 'fileformats' option is empty and DOS format is used, but while reading
a file some lines did not end in <CR><NL>, "[CR missing]" will be included in
@ -1018,11 +1022,11 @@ When the file name is actually a device name, Vim will not make a backup (that
would be impossible). You need to use "!", since the device already exists.
Example for Unix: >
:w! /dev/lpt0
and Windows: >
and MS-Windows: >
:w! lpt0
For Unix a device is detected when the name doesn't refer to a normal file or
a directory. A fifo or named pipe also looks like a device to Vim.
For Windows the device is detected by its name:
For MS-Windows the device is detected by its name:
CON
CLOCK$
NUL
@ -1248,7 +1252,7 @@ exist, the next-higher scope in the hierarchy applies.
Does not change the meaning of an already opened file,
because its full path name is remembered. Files from
the |arglist| may change though!
On Windows this also changes the active drive.
On MS-Windows this also changes the active drive.
To change to the directory of the current file: >
:cd %:h
<

19
runtime/doc/eval.txt
View File

@ -3466,16 +3466,15 @@ executable({expr}) *executable()*
arguments.
executable() uses the value of $PATH and/or the normal
searchpath for programs. *PATHEXT*
On Windows the ".exe", ".bat", etc. can
optionally be included. Then the extensions in $PATHEXT are
tried. Thus if "foo.exe" does not exist, "foo.exe.bat" can be
found. If $PATHEXT is not set then ".exe;.com;.bat;.cmd" is
used. A dot by itself can be used in $PATHEXT to try using
the name without an extension. When 'shell' looks like a
Unix shell, then the name is also tried without adding an
extension.
On Windows it only checks if the file exists and
is not a directory, not if it's really executable.
On MS-Windows the ".exe", ".bat", etc. can optionally be
included. Then the extensions in $PATHEXT are tried. Thus if
"foo.exe" does not exist, "foo.exe.bat" can be found. If
$PATHEXT is not set then ".exe;.com;.bat;.cmd" is used. A dot
by itself can be used in $PATHEXT to try using the name
without an extension. When 'shell' looks like a Unix shell,
then the name is also tried without adding an extension.
On MS-Windows it only checks if the file exists and is not a
directory, not if it's really executable.
On Windows an executable in the same directory as Vim is
always found (it is added to $PATH at |startup|).
The result is a Number:

8
runtime/doc/insert.txt
View File

@ -1937,10 +1937,10 @@ If the 'fileformats' option is not empty Vim tries to recognize the type of
changed, the detected format is only used while reading the file.
A similar thing happens with 'fileencodings'.
On non-Windows systems the message "[dos format]" is shown if
a file is read in DOS format, to remind you that something unusual is done.
On Macintosh and Windows the message "[unix format]" is shown if
a file is read in Unix format.
The message "[dos format]" is shown if a file is read in DOS format, to remind
you that something unusual is done.
On Macintosh and Win32 the message "[unix format]" is shown if a file is read
in Unix format.
On non-Macintosh systems, the message "[Mac format]" is shown if a file is
read in Mac format.

26
runtime/doc/options.txt
View File

@ -144,11 +144,11 @@ the option value, use '\"' instead. This example sets the 'titlestring'
option to 'hi "there"': >
:set titlestring=hi\ \"there\"
For Windows backslashes in file names are mostly not removed. More
precise: For options that expect a file name (those where environment
variables are expanded) a backslash before a normal file name character is not
removed. But a backslash before a special character (space, backslash, comma,
etc.) is used like explained above.
For Win32 backslashes in file names are mostly not removed. More precise: For
options that expect a file name (those where environment variables are
expanded) a backslash before a normal file name character is not removed. But
a backslash before a special character (space, backslash, comma, etc.) is used
like explained above.
There is one special situation, when the value starts with "\\": >
:set dir=\\machine\path results in "\\machine\path"
:set dir=\\\\machine\\path results in "\\machine\path"
@ -837,8 +837,8 @@ A jump table for the options with a short description can be found at |Q_op|.
impossible!). Writing may fail because of this.
- A directory "." means to put the backup file in the same directory
as the edited file.
- A directory starting with "./" (or ".\" for Windows) means to
put the backup file relative to where the edited file is. The
- A directory starting with "./" (or ".\" for MS-Windows) means
to put the backup file relative to where the edited file is. The
leading "." is replaced with the path name of the edited file.
("." inside a directory name has no special meaning).
- Spaces after the comma are ignored, other spaces are considered part
@ -2019,9 +2019,9 @@ A jump table for the options with a short description can be found at |Q_op|.
the edited file. On Unix, a dot is prepended to the file name, so
it doesn't show in a directory listing. On MS-Windows the "hidden"
attribute is set and a dot prepended if possible.
- A directory starting with "./" (or ".\" for Windows) means to
put the swap file relative to where the edited file is. The leading
"." is replaced with the path name of the edited file.
- A directory starting with "./" (or ".\" for MS-Windows) means
to put the swap file relative to where the edited file is. The
leading "." is replaced with the path name of the edited file.
- For Unix and Win32, if a directory ends in two path separators "//",
the swap file name will be built from the complete path to the file
with all path separators substituted to percent '%' signs. This will
@ -3014,7 +3014,7 @@ A jump table for the options with a short description can be found at |Q_op|.
<
*'helpfile'* *'hf'*
'helpfile' 'hf' string (default (MSDOS) "$VIMRUNTIME\doc\help.txt"
'helpfile' 'hf' string (default (MS-Windows) "$VIMRUNTIME\doc\help.txt"
(others) "$VIMRUNTIME/doc/help.txt")
global
Name of the main help file. All distributed help files should be
@ -5238,8 +5238,8 @@ A jump table for the options with a short description can be found at |Q_op|.
The name of the temporary file can be represented by "%s" if necessary
(the file name is appended automatically if no %s appears in the value
of this option).
For Windows the default is ">". The output is directly saved in a file
and not echoed to the screen.
For Windows the default is ">". The output is directly saved in a
file and not echoed to the screen.
For Unix the default it "| tee". The stdout of the compiler is saved
in a file and echoed to the screen. If the 'shell' option is "csh" or
"tcsh" after initializations, the default becomes "|& tee". If the

2
runtime/doc/recover.txt
View File

@ -62,7 +62,7 @@ Disadvantages:
If you want to put swap files in a fixed place, put a command resembling the
following ones in your vimrc:
:set dir=~/tmp (for Unix)
:set dir=c:\\tmp (for Windows)
:set dir=c:\\tmp (for Win32)
This is also very handy when editing files on floppy. Of course you will have
to create that "tmp" directory for this to work!

2
runtime/doc/repeat.txt
View File

@ -388,7 +388,7 @@ because the <CR> from the first lines will be lost.
On other systems, Vim expects ":source"ed files to end in a <NL>. These
always work. If you are using a file with <CR><NL> <EOL>s (for example, a
file made on Windows), all lines will have a trailing <CR>. This may cause
file made on MS-Windows), all lines will have a trailing <CR>. This may cause
problems for some commands (e.g., mappings). There is no automatic <EOL>
detection, because it's common to start with a line that defines a mapping
that ends in a <CR>, which will confuse the automaton.

6
runtime/doc/starting.txt
View File

@ -390,7 +390,7 @@ accordingly. Vim proceeds in this order:
1. Set the 'shell' option *SHELL* *COMSPEC*
The environment variable SHELL, if it exists, is used to set the
'shell' option. On Windows, the COMSPEC variable is used
'shell' option. On Win32, the COMSPEC variable is used
if SHELL is not set.
2. Process the arguments
@ -939,8 +939,8 @@ about to abandon with ":bdel", use ":wsh". The '[' and ']' marks are not
stored, but the '"' mark is. The '"' mark is very useful for jumping to the
cursor position when the file was last exited. No marks are saved for files
that start with any string given with the "r" flag in 'shada'. This can be
used to avoid saving marks for files on removable media (for Windows you would
use "ra:,rb:".
used to avoid saving marks for files on removable media (for MS-Windows you
would use "ra:,rb:").
The |v:oldfiles| variable is filled with the file names that the ShaDa file
has marks for.

12
runtime/doc/syntax.txt
View File

@ -56,10 +56,10 @@ with: >
For a color terminal see |:hi-normal-cterm|.
For setting up your own colors syntax highlighting see |syncolor|.
NOTE: The syntax files on Windows have lines that end in <CR><NL>. The files
for Unix end in <NL>. This means you should use the right type of file for
your system. Although on Windows the right format is automatically selected
if the 'fileformats' option is not empty.
NOTE: The syntax files on MS-Windows have lines that end in <CR><NL>.
The files for Unix end in <NL>. This means you should use the right type of
file for your system. Although on MS-Windows the right format is
automatically selected if the 'fileformats' option is not empty.
NOTE: When using reverse video ("gvim -fg white -bg black"), the default value
of 'background' will not be set until the GUI window is opened, which is after
@ -4919,8 +4919,8 @@ ctermbg={color-nr} *highlight-ctermbg*
*E419* *E420*
When Vim knows the normal foreground and background colors, "fg" and
"bg" can be used as color names. This only works after setting the
colors for the Normal group and for the Windows console. Example, for
reverse video: >
colors for the Normal group and for the MS-Windows console. Example,
for reverse video: >
:highlight Visual ctermfg=bg ctermbg=fg
< Note that the colors are used that are valid at the moment this
command are given. If the Normal group colors are changed later, the

9
runtime/doc/term.txt
View File

@ -289,7 +289,7 @@ border, the text is scrolled.
A selection can be started by pressing the left mouse button on the first
character, moving the mouse to the last character, then releasing the mouse
button. You will not always see the selection until you release the button,
only in some versions (GUI, Windows) will the dragging be shown immediately.
only in some versions (GUI, Win32) will the dragging be shown immediately.
Note that you can make the text scroll by moving the mouse at least one
character in the first/last line in the window when 'scrolloff' is non-zero.
@ -306,7 +306,7 @@ alt key is pressed (it may move the window).
*double-click*
Double, triple and quadruple clicks are supported when the GUI is active, for
Windows and for an xterm. For selecting text, extra clicks extend the
Win32 and for an xterm. For selecting text, extra clicks extend the
selection:
click select ~
double word or % match *<2-LeftMouse>*
@ -318,9 +318,8 @@ A double click on a word selects that word. 'iskeyword' is used to specify
which characters are included in a word. A double click on a character
that has a match selects until that match (like using "v%"). If the match is
an #if/#else/#endif block, the selection becomes linewise.
For MS-DOS and xterm the time for double clicking can be set with the
'mousetime' option. For the other systems this time is defined outside of
Vim.
For xterm the time for double clicking can be set with the 'mousetime' option.
For the other systems this time is defined outside of Vim.
An example, for using a double click to jump to the tag under the cursor: >
:map <2-LeftMouse> :exe "tag ". expand("<cword>")<CR>

4
runtime/doc/usr_02.txt
View File

@ -29,8 +29,8 @@ To start Vim, enter this command: >
gvim file.txt
On Unix you can type this at any command prompt. If you are running Windows,
open a command prompt window and enter the command. In either case, Vim
On Unix you can type this at any command prompt. If you are running Microsoft
Windows, open a Command Prompt and enter the command. In either case, Vim
starts editing a file called file.txt. Because this is a new file, you get a
blank window. This is what your screen will look like:

4
runtime/doc/usr_23.txt
View File

@ -27,8 +27,8 @@ start a new line. One to move the carriage back to the first position
When computers came out, storage was expensive. Some people decided that
they did not need two characters for end-of-line. The Unix people decided
they could use <Line Feed> only for end-of-line. The Apple people
standardized on <CR>. The MS-DOS (and Microsoft Windows) folks decided to
keep the old <CR><LF>.
standardized on <CR>. The Microsoft Windows folks decided to keep
the old <CR><LF>.
This means that if you try to move a file from one system to another, you
have line-break problems. The Vim editor automatically recognizes the
different file formats and handles things properly behind your back.

6
runtime/doc/usr_24.txt
View File

@ -563,9 +563,9 @@ that combination. Thus CTRL-K dP also works. Since there is no digraph for
"dP" Vim will also search for a "Pd" digraph.
Note:
The digraphs depend on the character set that Vim assumes you
are using. Always use ":digraphs" to find out which digraphs are
currently available.
The digraphs depend on the character set that Vim assumes you are
using. Always use ":digraphs" to find out which digraphs are currently
available.
You can define your own digraphs. Example: >

2
runtime/doc/usr_27.txt
View File

@ -83,7 +83,7 @@ matter if 'ignorecase' or 'smartcase' was changed.
Note:
If your search takes much longer than you expected, you can interrupt
it with CTRL-C on Unix and CTRL-Break on Windows.
it with CTRL-C on Unix and CTRL-Break on MS-Windows.
==============================================================================
*27.2* Wrapping around the file end

20
runtime/syntax/html.vim
View File

@ -3,8 +3,8 @@
" Maintainer: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
" Previous Maintainer: Claudio Fleiner <claudio@fleiner.com>
" Repository: https://notabug.org/jorgesumle/vim-html-syntax
" Last Change: 2018 Apr 7
" Included patch from Jorge Maldonado Ventura to fix rendering
" Last Change: 2019 Dec 24
" Included patch from Jorge Maldonado Ventura to add the dialog element
"
" Please check :help html.vim for some comments and a description of the options
@ -57,9 +57,9 @@ syn keyword htmlTagName contained object optgroup q s tbody tfoot thead
" new html 5 tags
syn keyword htmlTagName contained article aside audio bdi canvas data
syn keyword htmlTagName contained datalist details embed figcaption figure
syn keyword htmlTagName contained footer header hgroup keygen main mark
syn keyword htmlTagName contained menuitem meter nav output picture
syn keyword htmlTagName contained datalist details dialog embed figcaption
syn keyword htmlTagName contained figure footer header hgroup keygen main
syn keyword htmlTagName contained mark menuitem meter nav output picture
syn keyword htmlTagName contained progress rb rp rt rtc ruby section
syn keyword htmlTagName contained slot source template time track video wbr
@ -123,11 +123,11 @@ syn keyword htmlArg contained summary tabindex valuetype version
" html 5 arg names
syn keyword htmlArg contained allowfullscreen async autocomplete autofocus
syn keyword htmlArg contained autoplay challenge contenteditable contextmenu
syn keyword htmlArg contained controls crossorigin default dialog dirname
syn keyword htmlArg contained download draggable dropzone form formaction
syn keyword htmlArg contained formenctype formmethod formnovalidate formtarget
syn keyword htmlArg contained hidden high icon inputmode keytype kind list loop
syn keyword htmlArg contained low max min minlength muted nonce novalidate open
syn keyword htmlArg contained controls crossorigin default dirname download
syn keyword htmlArg contained draggable dropzone form formaction formenctype
syn keyword htmlArg contained formmethod formnovalidate formtarget hidden
syn keyword htmlArg contained high icon inputmode keytype kind list loop low
syn keyword htmlArg contained max min minlength muted nonce novalidate open
syn keyword htmlArg contained optimum pattern placeholder poster preload
syn keyword htmlArg contained radiogroup required reversed sandbox spellcheck
syn keyword htmlArg contained sizes srcset srcdoc srclang step title translate

4
src/nvim/po/da.po
View File

@ -6338,8 +6338,8 @@ msgstr "E799: Ugyldigt ID: %ld (skal være større end eller lig med 1)"
msgid "E801: ID already taken: %ld"
msgstr "E801: ID allerede taget: %ld"
msgid "List or number required"
msgstr "Liste eller nummer kræves"
msgid "E290: List or number required"
msgstr "E290: Liste eller nummer kræves"
#, c-format
msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"

4
src/nvim/po/ga.po
View File

@ -6408,8 +6408,8 @@ msgstr "E799: Aitheantas neamhbhail
msgid "E801: ID already taken: %ld"
msgstr "E801: Aitheantas in úsáid cheana: %ld"
msgid "List or number required"
msgstr "Tá gá le liosta nó uimhir"
msgid "E290: List or number required"
msgstr "E290: Tá gá le liosta nó uimhir"
#, c-format
msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"

4
src/nvim/po/tr.po
View File

@ -2258,8 +2258,8 @@ msgstr "E799: Geçersiz ID: %d (1'e eşit veya 1'den büyük olmalıdır)"
msgid "E801: ID already taken: %d"
msgstr "E801: Kullanımda olan ID: %d"
msgid "List or number required"
msgstr "Liste veya numara gerekiyor"
msgid "E290: List or number required"
msgstr "E290: Liste veya numara gerekiyor"
#, c-format
msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"