vim-patch:8024f9363683

Update runtime files.
8024f93636

Omit "modifyOtherKeys" changes.
This commit is contained in:
Jan Edmund Lazo 2021-04-25 11:56:17 -04:00
parent 5e1f434764
commit f406e4631d
No known key found for this signature in database
GPG Key ID: 64915E6E9F735B15
12 changed files with 45 additions and 58 deletions

View File

@ -65,14 +65,14 @@ endif
" zip#Browse: {{{2 " zip#Browse: {{{2
fun! zip#Browse(zipfile) fun! zip#Browse(zipfile)
" call Dfunc("zip#Browse(zipfile<".a:zipfile.">)") " call Dfunc("zip#Browse(zipfile<".a:zipfile.">)")
" sanity check: insure that the zipfile has "PK" as its first two letters " sanity check: ensure that the zipfile has "PK" as its first two letters
" (zipped files have a leading PK as a "magic cookie") " (zipped files have a leading PK as a "magic cookie")
if !filereadable(a:zipfile) || readfile(a:zipfile, "", 1)[0] !~ '^PK' if !filereadable(a:zipfile) || readfile(a:zipfile, "", 1)[0] !~ '^PK'
exe "noswapfile noautocmd noswapfile e ".fnameescape(a:zipfile) exe "noswapfile noautocmd noswapfile e ".fnameescape(a:zipfile)
" call Dret("zip#Browse : not a zipfile<".a:zipfile.">") " call Dret("zip#Browse : not a zipfile<".a:zipfile.">")
return return
" else " Decho " else " Decho
" call Decho("zip#Browse: a:zipfile<".a:zipfile."> passed PK test - its a zip file") " call Decho("zip#Browse: a:zipfile<".a:zipfile."> passed PK test - it's a zip file")
endif endif
let repkeep= &report let repkeep= &report
@ -95,7 +95,7 @@ fun! zip#Browse(zipfile)
endif endif
if !filereadable(a:zipfile) if !filereadable(a:zipfile)
if a:zipfile !~# '^\a\+://' if a:zipfile !~# '^\a\+://'
" if its an url, don't complain, let url-handlers such as vim do its thing " if it's an url, don't complain, let url-handlers such as vim do its thing
redraw! redraw!
echohl Error | echo "***error*** (zip#Browse) File not readable<".a:zipfile.">" | echohl None echohl Error | echo "***error*** (zip#Browse) File not readable<".a:zipfile.">" | echohl None
" call inputsave()|call input("Press <cr> to continue")|call inputrestore() " call inputsave()|call input("Press <cr> to continue")|call inputrestore()

View File

@ -263,13 +263,13 @@ all loaded. For example, if this command: >
produces this output: produces this output:
runtimepath=/etc/vim,~/.config/nvim,/usr/local/share/vim/vim60 ~ runtimepath=/etc/vim,~/.config/nvim,/usr/local/share/vim/vim82 ~
then Vim will load all plugins in these directories and below: then Vim will load all plugins in these directories and below:
/etc/vim/plugin/ ~ /etc/vim/plugin/ ~
~/.config/nvim/plugin/ ~ ~/.config/nvim/plugin/ ~
/usr/local/share/vim/vim60/plugin/ ~ /usr/local/share/vim/vim82/plugin/ ~
Note that the last one is the value of $VIMRUNTIME which has been expanded. Note that the last one is the value of $VIMRUNTIME which has been expanded.

View File

@ -61,6 +61,8 @@ tag char action in Insert mode ~
the cursor the cursor
|i_CTRL-Q| CTRL-Q same as CTRL-V, unless used for terminal |i_CTRL-Q| CTRL-Q same as CTRL-V, unless used for terminal
control flow control flow
|i_CTRL-SHIFT-Q| CTRL-SHIFT-Q {char}
like CTRL-Q unless |modifyOtherKeys| is active
|i_CTRL-R| CTRL-R {register} |i_CTRL-R| CTRL-R {register}
insert the contents of a register insert the contents of a register
|i_CTRL-R_CTRL-R| CTRL-R CTRL-R {register} |i_CTRL-R_CTRL-R| CTRL-R CTRL-R {register}
@ -77,6 +79,8 @@ tag char action in Insert mode ~
|i_CTRL-U| CTRL-U delete all entered characters in the current |i_CTRL-U| CTRL-U delete all entered characters in the current
line line
|i_CTRL-V| CTRL-V {char} insert next non-digit literally |i_CTRL-V| CTRL-V {char} insert next non-digit literally
|i_CTRL-SHIFT-V| CTRL-SHIFT-V {char}
like CTRL-V unless |modifyOtherKeys| is active
|i_CTRL-V_digit| CTRL-V {number} insert three digit decimal number as a single |i_CTRL-V_digit| CTRL-V {number} insert three digit decimal number as a single
byte. byte.
|i_CTRL-W| CTRL-W delete word before the cursor |i_CTRL-W| CTRL-W delete word before the cursor

View File

@ -1937,11 +1937,11 @@ 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. changed, the detected format is only used while reading the file.
A similar thing happens with 'fileencodings'. A similar thing happens with 'fileencodings'.
The message "[dos format]" is shown if a file is read in DOS format, to remind On non-Win32 systems the message "[dos format]" is shown if a file is read in
you that something unusual is done. 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 On Macintosh and Win32 the message "[unix format]" is shown if a file is read
in Unix format. in Unix format.
On non-Macintosh systems, the message "[Mac format]" is shown if a file is On non-Macintosh systems, the message "[mac format]" is shown if a file is
read in Mac format. read in Mac format.
An example on how to use ":r !": > An example on how to use ":r !": >

View File

@ -590,9 +590,9 @@ A jump table for the options with a short description can be found at |Q_op|.
(or Vim is run inside an xterm invoked with "-cjkwidth" option.), (or Vim is run inside an xterm invoked with "-cjkwidth" option.),
this option should be set to "double" to match the width perceived this option should be set to "double" to match the width perceived
by Vim with the width of glyphs in the font. Perhaps it also has by Vim with the width of glyphs in the font. Perhaps it also has
to be set to "double" under CJK Windows XP when the system locale is to be set to "double" under CJK MS-Windows when the system locale is
set to one of CJK locales. set to one of CJK locales. See Unicode Standard Annex #11
See Unicode Standard Annex #11 (http://www.unicode.org/reports/tr11). (http://www.unicode.org/reports/tr11).
Vim may set this option automatically at startup time when Vim is Vim may set this option automatically at startup time when Vim is
compiled with the |+termresponse| feature and if t_u7 is set to the compiled with the |+termresponse| feature and if t_u7 is set to the
@ -837,9 +837,9 @@ A jump table for the options with a short description can be found at |Q_op|.
impossible!). Writing may fail because of this. impossible!). Writing may fail because of this.
- A directory "." means to put the backup file in the same directory - A directory "." means to put the backup file in the same directory
as the edited file. as the edited file.
- A directory starting with "./" (or ".\" for MS-Windows) means - A directory starting with "./" (or ".\" for MS-Windows) means to put
to put the backup file relative to where the edited file is. The the backup file relative to where the edited file is. The leading
leading "." is replaced with the path name of the edited file. "." is replaced with the path name of the edited file.
("." inside a directory name has no special meaning). ("." inside a directory name has no special meaning).
- Spaces after the comma are ignored, other spaces are considered part - Spaces after the comma are ignored, other spaces are considered part
of the directory name. To have a space at the start of a directory of the directory name. To have a space at the start of a directory
@ -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 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" it doesn't show in a directory listing. On MS-Windows the "hidden"
attribute is set and a dot prepended if possible. attribute is set and a dot prepended if possible.
- A directory starting with "./" (or ".\" for MS-Windows) means - A directory starting with "./" (or ".\" for MS-Windows) means to put
to put the swap file relative to where the edited file is. The the swap file relative to where the edited file is. The leading "."
leading "." is replaced with the path name of the edited file. is replaced with the path name of the edited file.
- For Unix and Win32, if a directory ends in two path separators "//", - 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 the swap file name will be built from the complete path to the file
with all path separators substituted to percent '%' signs. This will with all path separators substituted to percent '%' signs. This will
@ -5218,9 +5218,9 @@ A jump table for the options with a short description can be found at |Q_op|.
'shellcmdflag' 'shcf' string (default: "-c"; Windows: "/s /c") 'shellcmdflag' 'shcf' string (default: "-c"; Windows: "/s /c")
global global
Flag passed to the shell to execute "!" and ":!" commands; e.g., Flag passed to the shell to execute "!" and ":!" commands; e.g.,
`bash.exe -c ls` or `cmd.exe /s /c "dir"`. For Windows `bash.exe -c ls` or `cmd.exe /s /c "dir"`. For MS-Windows, the
systems, the default is set according to the value of 'shell', to default is set according to the value of 'shell', to reduce the need
reduce the need to set this option by the user. to set this option by the user.
On Unix it can have more than one flag. Each white space separated On Unix it can have more than one flag. Each white space separated
part is passed as an argument to the shell command. part is passed as an argument to the shell command.
See |option-backslash| about including spaces and backslashes. See |option-backslash| about including spaces and backslashes.
@ -5230,7 +5230,8 @@ A jump table for the options with a short description can be found at |Q_op|.
security reasons. security reasons.
*'shellpipe'* *'sp'* *'shellpipe'* *'sp'*
'shellpipe' 'sp' string (default ">", "| tee", "|& tee" or "2>&1| tee") 'shellpipe' 'sp' string (default ">", ">%s 2>&1", "| tee", "|& tee" or
"2>&1| tee")
global global
String to be used to put the output of the ":make" command in the String to be used to put the output of the ":make" command in the
error file. See also |:make_makeprg|. See |option-backslash| about error file. See also |:make_makeprg|. See |option-backslash| about
@ -5238,8 +5239,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 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 (the file name is appended automatically if no %s appears in the value
of this option). of this option).
For Windows the default is ">". The output is directly saved in a For MS-Windows the default is ">%s 2>&1". The output is directly
file and not echoed to the screen. saved in a file and not echoed to the screen.
For Unix the default it "| tee". The stdout of the compiler is saved 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 in a file and echoed to the screen. If the 'shell' option is "csh" or
"tcsh" after initializations, the default becomes "|& tee". If the "tcsh" after initializations, the default becomes "|& tee". If the
@ -5305,11 +5306,11 @@ A jump table for the options with a short description can be found at |Q_op|.
*'shellslash'* *'ssl'* *'noshellslash'* *'nossl'* *'shellslash'* *'ssl'* *'noshellslash'* *'nossl'*
'shellslash' 'ssl' boolean (default off) 'shellslash' 'ssl' boolean (default off)
global global
{only for Windows} {only for MS-Windows}
When set, a forward slash is used when expanding file names. This is When set, a forward slash is used when expanding file names. This is
useful when a Unix-like shell is used instead of command.com or useful when a Unix-like shell is used instead of cmd.exe. Backward
cmd.exe. Backward slashes can still be typed, but they are changed to slashes can still be typed, but they are changed to forward slashes by
forward slashes by Vim. Vim.
Note that setting or resetting this option has no effect for some Note that setting or resetting this option has no effect for some
existing file names, thus this option needs to be set before opening existing file names, thus this option needs to be set before opening
any file for best results. This might change in the future. any file for best results. This might change in the future.

View File

@ -154,4 +154,4 @@ Copyright: Copyright (C) 2005-2015 Charles E Campbell *zip-copyright*
v1 Sep 15, 2005 * Initial release, had browsing, reading, and writing v1 Sep 15, 2005 * Initial release, had browsing, reading, and writing
============================================================================== ==============================================================================
vim:tw=78:ts=8:ft=help:fdm=marker vim:tw=78:ts=8:noet:ft=help:fdm=marker

View File

@ -597,22 +597,15 @@ X11
http://www.cs.wisc.edu/~ghost/gv/ http://www.cs.wisc.edu/~ghost/gv/
Windows MS-Windows
- GSview. Obtainable from: - GSview. Obtainable from:
http://www.cs.wisc.edu/~ghost/gsview/ http://www.cs.wisc.edu/~ghost/gsview/
DOS
- ps_view. Obtainable from:
ftp://ftp.pg.gda.pl/pub/TeX/support/ps_view/
ftp://ftp.dante.de/tex-archive/support/ps_view/
Linux Linux
- GSview. Linux version of the popular Windows previewer. - GSview. Linux version of the popular MS-Windows previewer.
Obtainable from: Obtainable from:
http://www.cs.wisc.edu/~ghost/gsview/ http://www.cs.wisc.edu/~ghost/gsview/

View File

@ -926,11 +926,11 @@ or simpler >
"$*" can be given multiple times, for example: > "$*" can be given multiple times, for example: >
:set makeprg=gcc\ -o\ $*\ $* :set makeprg=gcc\ -o\ $*\ $*
The 'shellpipe' option defaults to ">" on Windows. This means that the output The 'shellpipe' option defaults to ">%s 2>&1" for Win32.
of the compiler is saved in a file and not shown on the screen directly. For This means that the output of the compiler is saved in a file and not shown on
Unix "| tee" is used. The compiler output is shown on the screen and saved in the screen directly. For Unix "| tee" is used. The compiler output is shown
a file the same time. Depending on the shell used "|& tee" or "2>&1| tee" is on the screen and saved in a file the same time. Depending on the shell used
the default, so stderr output will be included. "|& tee" or "2>&1| tee" is the default, so stderr output will be included.
If 'shellpipe' is empty, the {errorfile} part will be omitted. This is useful If 'shellpipe' is empty, the {errorfile} part will be omitted. This is useful
for compilers that write to an errorfile themselves. for compilers that write to an errorfile themselves.

View File

@ -622,7 +622,7 @@ Nvim will try to get the value for $VIMRUNTIME in this order:
1. Environment variable $VIMRUNTIME, if it is set. 1. Environment variable $VIMRUNTIME, if it is set.
2. Directory path "$VIM/vim{version}", if it exists, where {version} is the 2. Directory path "$VIM/vim{version}", if it exists, where {version} is the
Vim version number without '-' or '.'. For example: "$VIM/vim54". Vim version number without '-' or '.'. For example: "$VIM/vim82".
3. Directory path "$VIM/runtime", if it exists. 3. Directory path "$VIM/runtime", if it exists.
4. Value of $VIM environment variable. This is for backwards compatibility 4. Value of $VIM environment variable. This is for backwards compatibility
with older Vim versions. with older Vim versions.

View File

@ -37,8 +37,8 @@ If the VIM environment variable is not set, Vim will try to find
the path in another way (see |$VIMRUNTIME|). Usually this works just the path in another way (see |$VIMRUNTIME|). Usually this works just
fine. If it doesn't, try setting the VIM environment variable to the fine. If it doesn't, try setting the VIM environment variable to the
directory where the Vim stuff is located. For example, if your syntax files directory where the Vim stuff is located. For example, if your syntax files
are in the "/usr/vim/vim81/syntax" directory, set $VIMRUNTIME to are in the "/usr/vim/vim82/syntax" directory, set $VIMRUNTIME to
"/usr/vim/vim81". You must do this in the shell, before starting Vim. "/usr/vim/vim82". You must do this in the shell, before starting Vim.
This command also sources the |menu.vim| script when the GUI is running or This command also sources the |menu.vim| script when the GUI is running or
will start soon. See |'go-M'| about avoiding that. will start soon. See |'go-M'| about avoiding that.

View File

@ -318,8 +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 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 that has a match selects until that match (like using "v%"). If the match is
an #if/#else/#endif block, the selection becomes linewise. an #if/#else/#endif block, the selection becomes linewise.
For xterm the time for double clicking can be set with the 'mousetime' option. For MS-Windows and xterm the time for double clicking can be set with the
For the other systems this time is defined outside of Vim. '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: > An example, for using a double click to jump to the tag under the cursor: >
:map <2-LeftMouse> :exe "tag ". expand("<cword>")<CR> :map <2-LeftMouse> :exe "tag ". expand("<cword>")<CR>

View File

@ -673,21 +673,10 @@ syntax file, earlier in 'runtimepath' was already loaded: >
finish finish
endif endif
To be compatible with Vim 5.8 use: >
if version < 600
syntax clear
elseif exists("b:current_syntax")
finish
endif
Set "b:current_syntax" to the name of the syntax at the end. Don't forget Set "b:current_syntax" to the name of the syntax at the end. Don't forget
that included files do this too, you might have to reset "b:current_syntax" if that included files do this too, you might have to reset "b:current_syntax" if
you include two files. you include two files.
If you want your syntax file to work with Vim 5.x, add a check for v:version.
Find an syntax file in the Vim 7.2 distribution for an example.
Do not include anything that is a user preference. Don't set 'tabstop', Do not include anything that is a user preference. Don't set 'tabstop',
'expandtab', etc. These belong in a filetype plugin. 'expandtab', etc. These belong in a filetype plugin.