Update runtime files.
diff --git a/runtime/autoload/getscript.vim b/runtime/autoload/getscript.vim
index 8f854b9..a266a55 100644
--- a/runtime/autoload/getscript.vim
+++ b/runtime/autoload/getscript.vim
@@ -236,7 +236,7 @@
" call Decho("..depscript<".depscript.">")
" found a "GetLatestVimScripts: # #" line in the script;
- " check if its already in the datafile by searching backwards from llp1,
+ " check if it's already in the datafile by searching backwards from llp1,
" the (prior to reading in the plugin script) last line plus one of the GetLatestVimScripts.dat file,
" for the script-id with no wrapping allowed.
let curline = line(".")
diff --git a/runtime/autoload/tar.vim b/runtime/autoload/tar.vim
index 3ed34fd..9f96094 100644
--- a/runtime/autoload/tar.vim
+++ b/runtime/autoload/tar.vim
@@ -121,7 +121,7 @@
if !filereadable(a:tarfile)
" call Decho('a:tarfile<'.a:tarfile.'> not filereadable')
if a:tarfile !~# '^\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!
" call Decho("***error*** (tar#Browse) File not readable<".a:tarfile.">")
echohl Error | echo "***error*** (tar#Browse) File not readable<".a:tarfile.">" | echohl None
diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim
index 874f445..d6bde99 100644
--- a/runtime/autoload/zip.vim
+++ b/runtime/autoload/zip.vim
@@ -65,14 +65,14 @@
" zip#Browse: {{{2
fun! zip#Browse(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")
if !filereadable(a:zipfile) || readfile(a:zipfile, "", 1)[0] !~ '^PK'
exe "noswapfile noautocmd noswapfile e ".fnameescape(a:zipfile)
" call Dret("zip#Browse : not a zipfile<".a:zipfile.">")
return
" 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
let repkeep= &report
@@ -95,7 +95,7 @@
endif
if !filereadable(a:zipfile)
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!
echohl Error | echo "***error*** (zip#Browse) File not readable<".a:zipfile.">" | echohl None
" call inputsave()|call input("Press <cr> to continue")|call inputrestore()
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 75ee0b5..e0a7d19 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -307,13 +307,13 @@
produces this output:
- runtimepath=/etc/vim,~/.vim,/usr/local/share/vim/vim60 ~
+ runtimepath=/etc/vim,~/.vim,/usr/local/share/vim/vim82 ~
then Vim will load all plugins in these directories and below:
/etc/vim/plugin/ ~
~/.vim/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.
diff --git a/runtime/doc/gui_w32.txt b/runtime/doc/gui_w32.txt
index f223cf5..002fab3 100644
--- a/runtime/doc/gui_w32.txt
+++ b/runtime/doc/gui_w32.txt
@@ -106,16 +106,15 @@
You can also install Vim in the "Send To" menu:
1. Start a Windows Explorer
2. Navigate to your sendto directory:
- Windows NT: %windir%\profiles\%user%\sendto (e.g.
- "c:\winnt\profiles\mattha\sendto")
Windows XP: C:\Documents and Settings\%user%\SendTo
Windows Vista: C:\Users\%user%\AppData\Roaming\Microsoft\Windows\SendTo .
3. Right-click in the file pane and select New->Shortcut
4. Follow the shortcut wizard, using the full path to VIM/GVIM.
When you 'send a file to Vim', Vim changes to that file's directory. Note,
-however, that any long directory names will appear in their short (MS-Windows)
-form. This is a limitation of the Windows "Send To" mechanism.
+however, that any long directory names will appear in their short (MS-DOS)
+form on some Windows versions. This is a limitation of the Windows "Send To"
+mechanism.
*notepad*
You could replace notepad.exe with gvim.exe, but that has a few side effects.
@@ -169,8 +168,8 @@
Vim Shell Extension
HKEY_LOCAL_MACHINE\Software\Vim\Gvim
path {path}\gvim.exe
- HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\vim 5.6
- DisplayName Vim 5.6: Edit with Vim popup menu entry
+ HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\vim 8.2
+ DisplayName Vim 8.2: Edit with Vim popup menu entry
UninstallString {path}\uninstall.exe
Replace {path} with the path that leads to the executable.
@@ -214,7 +213,7 @@
[HKEY_CLASSES_ROOT\Applications\gvim.exe\shell\edit]
[HKEY_CLASSES_ROOT\Applications\gvim.exe\shell\edit\command]
-@="c:\\vim\\vim62\\gvim.exe \"%1\""
+@="c:\\vim\\vim82\\gvim.exe \"%1\""
[HKEY_CLASSES_ROOT\.htm\OpenWithList\gvim.exe]
@@ -222,7 +221,7 @@
----------------------------------------------------------
-Change the "c:\\vim\\vim62" bit to where gvim.exe is actually located.
+Change the "c:\\vim\\vim82" bit to where gvim.exe is actually located.
To uninstall this run the Vim uninstall program or manually delete the
registry entries with "regedit".
diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt
index 685c99a..8f67ef5 100644
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -197,7 +197,7 @@
|os_390.txt| OS/390 Unix
|os_amiga.txt| Amiga
|os_beos.txt| BeOS and BeBox
-|os_dos.txt| MS-DOS and MS-Windows NT/95 common items
+|os_dos.txt| MS-DOS and MS-Windows common items
|os_mac.txt| Macintosh
|os_mint.txt| Atari MiNT
|os_msdos.txt| MS-DOS (plain DOS and DOS box under Windows)
@@ -206,7 +206,7 @@
|os_risc.txt| RISC-OS
|os_unix.txt| Unix
|os_vms.txt| VMS
-|os_win32.txt| MS-Windows 95/98/NT
+|os_win32.txt| MS-Windows
*standard-plugin-list*
Standard plugins ~
|pi_getscript.txt| Downloading latest version of Vim scripts
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index afbf9b4..2a646a1 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1,4 +1,4 @@
-*index.txt* For Vim version 8.2. Last change: 2019 Sep 27
+*index.txt* For Vim version 8.2. Last change: 2020 Jan 14
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -73,6 +73,8 @@
the cursor
|i_CTRL-Q| CTRL-Q same as CTRL-V, unless used for terminal
control flow
+|i_CTRL-SHIFT-Q| CTRL-SHIFT-Q {char}
+ like CTRL-Q unless |modifyOtherKeys| is active
|i_CTRL-R| CTRL-R {register}
insert the contents of a register
|i_CTRL-R_CTRL-R| CTRL-R CTRL-R {register}
@@ -89,6 +91,8 @@
|i_CTRL-U| CTRL-U delete all entered characters in the current
line
|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
byte.
|i_CTRL-W| CTRL-W delete word before the cursor
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 07e9eb5..5dd29a1 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -200,15 +200,15 @@
is converted back to what it was without |modifyOtherKeys|,
unless the Shift key is also pressed.
- *i_CTRL-SHIFT-V*
-CTRL-SHIFT-V Works just like CTRL-V, unless |modifyOtherKeys| is active,
- then it inserts the Escape sequence for a key with modifiers.
-
*i_CTRL-Q*
CTRL-Q Same as CTRL-V.
Note: Some terminal connections may eat CTRL-Q, it doesn't
work then. It does work in the GUI.
+CTRL-SHIFT-V *i_CTRL-SHIFT-V* *i_CTRL-SHIFT-Q*
+CTRL-SHIFT-Q Works just like CTRL-V, unless |modifyOtherKeys| is active,
+ then it inserts the Escape sequence for a key with modifiers.
+
CTRL-X Enter CTRL-X mode. This is a sub-mode where commands can
be given to complete words or scroll the window. See
|i_CTRL-X| and |ins-completion|.
@@ -2009,11 +2009,11 @@
changed, the detected format is only used while reading the file.
A similar thing happens with 'fileencodings'.
-The message "[dos format]" is shown if a file is read in DOS format, to remind
-you that something unusual is done.
+On non-Win32 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 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
+On non-Macintosh systems, the message "[mac format]" is shown if a file is
read in Mac format.
An example on how to use ":r !": >
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 55c9c12..bf643c0 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -845,8 +845,9 @@
A known side effect effect is that in Insert mode the raw escape sequence is
inserted after the CTRL-V key. This can be used to check whether
-modifyOtherKeys is enabled: In Insert mode type CTRL-V CTRL-V, if you get
-one byte then modifyOtherKeys is off, if you get <1b>27;5;118~ then it is on.
+modifyOtherKeys is enabled: In Insert mode type CTRL-SHIFT-V CTRL-V, if you
+get one byte then modifyOtherKeys is off, if you get <1b>27;5;118~ then it is
+on.
When the 'esckeys' option is off, then modifyOtherKeys will be disabled in
Insert mode to avoid every key with a modifier causing Insert mode to end.
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index f65d46f..b86244f 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -709,9 +709,9 @@
(or Vim is run inside an xterm invoked with "-cjkwidth" option.),
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
- to be set to "double" under CJK MS-Windows 2k/XP
- when the system locale is set to one of CJK locales. See Unicode
- Standard Annex #11 (http://www.unicode.org/reports/tr11).
+ to be set to "double" under CJK MS-Windows when the system locale is
+ set to one of CJK locales. See Unicode Standard Annex #11
+ (http://www.unicode.org/reports/tr11).
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
@@ -1018,9 +1018,9 @@
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 MS-Windows et al.) 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.
+ - 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
of the directory name. To have a space at the start of a directory
@@ -2712,9 +2712,9 @@
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 MS-Windows et al.) 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
@@ -3593,7 +3593,7 @@
{only available when compiled with GUI enabled, and
for Win32 console}
This option tells Vim what the cursor should look like in different
- modes. It fully works in the GUI. In an Win32 console, only the
+ modes. It fully works in the GUI. In a Win32 console, only the
height of the cursor can be changed. This can be done by specifying a
block cursor, or a percentage for a vertical or horizontal cursor.
For a console the 't_SI', 't_SR', and 't_EI' escape sequences are
@@ -6075,7 +6075,7 @@
*'restorescreen'* *'rs'* *'norestorescreen'* *'nors'*
'restorescreen' 'rs' boolean (default on)
global
- {only in Windows 95/NT console version}
+ {only in MS-Windows console version}
When set, the screen contents is restored when exiting Vim. This also
happens when executing external commands.
@@ -6497,9 +6497,9 @@
somewhere: "/c")
global
Flag passed to the shell to execute "!" and ":!" commands; e.g.,
- "bash.exe -c ls" or "command.com /c dir". For the MS-Windows-like
- systems, the default is set according to the value of 'shell', to
- reduce the need to set this option by the user.
+ "bash.exe -c ls" or "cmd.exe /c dir". For MS-Windows, the default is
+ set according to the value of 'shell', to reduce the need to set this
+ option by the user.
On Unix it can have more than one flag. Each white space separated
part is passed as an argument to the shell command.
See |option-backslash| about including spaces and backslashes.
@@ -6508,7 +6508,8 @@
security reasons.
*'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
{not available when compiled without the |+quickfix|
feature}
@@ -6518,8 +6519,9 @@
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 the Amiga the default is ">". The output is directly saved in a
- file and not echoed to the screen.
+ For the Amiga the default is ">". For MS-Windows the default is
+ ">%s 2>&1". 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
@@ -6587,9 +6589,9 @@
global
{only for MS-Windows}
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
- cmd.exe. Backward slashes can still be typed, but they are changed to
- forward slashes by Vim.
+ useful when a Unix-like shell is used instead of cmd.exe. Backward
+ slashes can still be typed, but they are changed to forward slashes by
+ Vim.
Note that setting or resetting this option has no effect for some
existing file names, thus this option needs to be set before opening
any file for best results. This might change in the future.
@@ -8205,7 +8207,7 @@
NOTE: This option is reset when 'compatible' is set.
*'undolevels'* *'ul'*
-'undolevels' 'ul' number (default 100, 1000 for Unix, VMS, Win32)
+'undolevels' 'ul' number (default 100, 1000 for Unix, VMS and Win32)
global or local to buffer |global-local|
Maximum number of changes that can be undone. Since undo information
is kept in memory, higher numbers will cause more memory to be used.
diff --git a/runtime/doc/os_dos.txt b/runtime/doc/os_dos.txt
index 00b0059..bc883c8 100644
--- a/runtime/doc/os_dos.txt
+++ b/runtime/doc/os_dos.txt
@@ -39,7 +39,7 @@
environment variable. The runtime files will be found in "$VIM/vim{version}".
Example: >
set VIM=E:\vim
-Will find the version 5.4 runtime files in "e:\vim\vim54".
+Will find the version 8.2 runtime files in "e:\vim\vim82".
Note: This is _not_ recommended. The preferred way is to keep the executable
in the runtime directory.
@@ -47,8 +47,8 @@
somewhere else, you must set $VIM to where you vimrc files are, and set
$VIMRUNTIME to the runtime files. Example: >
set VIM=C:\usr\piet
- set VIMRUNTIME=E:\vim\vim54
-Will find "c:\user\piet\_vimrc" and the runtime files in "e:\vim\vim54".
+ set VIMRUNTIME=E:\vim\vim82
+Will find "c:\user\piet\_vimrc" and the runtime files in "e:\vim\vim82".
See |$VIM| and |$VIMRUNTIME| for more information.
diff --git a/runtime/doc/pi_getscript.txt b/runtime/doc/pi_getscript.txt
index b22e201..980507d 100644
--- a/runtime/doc/pi_getscript.txt
+++ b/runtime/doc/pi_getscript.txt
@@ -1,4 +1,4 @@
-*pi_getscript.txt* For Vim version 7.0. Last change: 2013 Nov 29
+*pi_getscript.txt* For Vim version 8.2. Last change: 2017 Aug 01
>
GETSCRIPT REFERENCE MANUAL by Charles E. Campbell
<
@@ -9,7 +9,7 @@
The VIM LICENSE (see |copyright|) applies to the files in this
package, including getscriptPlugin.vim, getscript.vim,
GetLatestVimScripts.dist, and pi_getscript.txt, except use "getscript"
- instead of "VIM". Like anything else that's free, getscript and its
+ instead of "Vim". Like anything else that's free, getscript and its
associated files are provided *as is* and comes with no warranty of
any kind, either expressed or implied. No guarantees of
merchantability. No guarantees of suitability for any purpose. By
@@ -68,7 +68,7 @@
mv GetLatestVimScripts.dist GetLatestVimScripts.dat
(edit GetLatestVimScripts.dat to install your own personal
list of desired plugins -- see |GetLatestVimScripts_dat|)
-
+
3. Windows:
vim getscript.vba
:so %
@@ -389,7 +389,7 @@
plugin/*.vim in globpath() call.
* (Andy Wokula) got warning message when setting
g:loaded_getscriptPlugin
-v35 Apr 07, 2012 : * (MengHuan Yu) pointed out that the script url has
+v35 Apr 07, 2012 : * (MengHuan Yu) pointed out that the script URL has
changed (somewhat). However, it doesn't work, and
the original one does (under Linux). I'll make it
yet-another-option.
@@ -479,4 +479,4 @@
and they became numbers. Fixes comparison.
==============================================================================
-vim:tw=78:ts=8:ft=help:fdm=marker
+vim:tw=78:ts=8:noet:ft=help:fdm=marker
diff --git a/runtime/doc/pi_logipat.txt b/runtime/doc/pi_logipat.txt
index b9f435d..e72fabe 100644
--- a/runtime/doc/pi_logipat.txt
+++ b/runtime/doc/pi_logipat.txt
@@ -1,4 +1,4 @@
-*pi_logipat.txt* Logical Patterns May 01, 2019
+*pi_logipat.txt* Logical Patterns May 01, 2019
Author: Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
Copyright: (c) 2004-2016 by Charles E. Campbell *logiPat-copyright*
@@ -119,4 +119,4 @@
==============================================================================
-vim:tw=78:ts=8:ft=help
+vim:tw=78:ts=8:noet:ft=help
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index 2cce1d0..08efbe3 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -1,4 +1,4 @@
-*pi_netrw.txt* For Vim version 8.2. Last change: 2020 Jan 07
+*pi_netrw.txt* For Vim version 8.2. Last change: 2020 Jan 14
------------------------------------------------
NETRW REFERENCE MANUAL by Charles E. Campbell
@@ -1184,7 +1184,7 @@
*.netrwbook*
Bookmarks are retained in between sessions of vim in a file called .netrwbook
as a |List|, which is typically stored in the first directory on the user's
-runtimepath; entries are kept in sorted order.
+'runtimepath'; entries are kept in sorted order.
If there are marked files and/or directories, mb will add them to the bookmark
list.
@@ -3513,7 +3513,7 @@
- Click "Add..."
- Set External Editor (adjust path as needed, include
the quotes and !.! at the end):
- "c:\Program Files\Vim\vim70\gvim.exe" !.!
+ "c:\Program Files\Vim\vim82\gvim.exe" !.!
- Check that the filetype in the box below is
{asterisk}.{asterisk} (all files), or whatever types
you want (cec: change {asterisk} to * ; I had to
@@ -3763,8 +3763,8 @@
The <netrw.vim> script is typically installed on systems as something like:
>
- /usr/local/share/vim/vim7x/plugin/netrwPlugin.vim
- /usr/local/share/vim/vim7x/autoload/netrw.vim
+ /usr/local/share/vim/vim8x/plugin/netrwPlugin.vim
+ /usr/local/share/vim/vim8x/autoload/netrw.vim
(see output of :echo &rtp)
<
which is loaded automatically at startup (assuming :set nocp). If you
@@ -4306,4 +4306,4 @@
==============================================================================
Modelines: {{{1
- vim:tw=78:ts=8:ft=help:norl:fdm=marker
+ vim:tw=78:ts=8:noet:ft=help:norl:fdm=marker
diff --git a/runtime/doc/pi_tar.txt b/runtime/doc/pi_tar.txt
index a59a584..c6c0596 100644
--- a/runtime/doc/pi_tar.txt
+++ b/runtime/doc/pi_tar.txt
@@ -167,4 +167,4 @@
(see http://michael.toren.net/code/)
==============================================================================
-vim:tw=78:ts=8:ft=help
+vim:tw=78:ts=8:noet:ft=help
diff --git a/runtime/doc/pi_vimball.txt b/runtime/doc/pi_vimball.txt
index 0a56637..e16a338 100644
--- a/runtime/doc/pi_vimball.txt
+++ b/runtime/doc/pi_vimball.txt
@@ -273,4 +273,4 @@
==============================================================================
-vim:tw=78:ts=8:ft=help:fdm=marker
+vim:tw=78:ts=8:noet:ft=help:fdm=marker
diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt
index 098d5d7..d70df81 100644
--- a/runtime/doc/pi_zip.txt
+++ b/runtime/doc/pi_zip.txt
@@ -154,4 +154,4 @@
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
diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt
index cae12b7..3f231d0 100644
--- a/runtime/doc/print.txt
+++ b/runtime/doc/print.txt
@@ -627,16 +627,9 @@
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
-- GSview. Linux version of the popular MS-Windows.
+- GSview. Linux version of the popular MS-Windows previewer.
Obtainable from:
http://www.cs.wisc.edu/~ghost/gsview/
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 1013023..5fb8c51 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -944,11 +944,11 @@
"$*" can be given multiple times, for example: >
:set makeprg=gcc\ -o\ $*\ $*
-The 'shellpipe' option defaults to ">" for the Amiga and Win32. This means
-that the output of the compiler is saved in a file and not shown on the screen
-directly. For Unix "| tee" is used. The compiler output is shown on the
-screen and saved in a file the same time. Depending on the shell used "|&
-tee" or "2>&1| tee" is the default, so stderr output will be included.
+The 'shellpipe' option defaults to ">" for the Amiga and ">%s 2>&1" for Win32.
+This means that the output of the compiler is saved in a file and not shown on
+the screen directly. For Unix "| tee" is used. The compiler output is shown
+on the screen and saved in a file the same time. Depending on the shell used
+"|& 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
for compilers that write to an errorfile themselves (e.g., Manx's Amiga C).
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index fa3c670..d4f542d 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -326,25 +326,25 @@
spell file is used.
For example, with these values:
- 'runtimepath' is "~/.vim,/usr/share/vim81,~/.vim/after"
+ 'runtimepath' is "~/.vim,/usr/share/vim82,~/.vim/after"
'encoding' is "iso-8859-2"
'spelllang' is "pl"
Vim will look for:
1. ~/.vim/spell/pl.iso-8859-2.spl
-2. /usr/share/vim81/spell/pl.iso-8859-2.spl
+2. /usr/share/vim82/spell/pl.iso-8859-2.spl
3. ~/.vim/spell/pl.iso-8859-2.add.spl
-4. /usr/share/vim81/spell/pl.iso-8859-2.add.spl
+4. /usr/share/vim82/spell/pl.iso-8859-2.add.spl
5. ~/.vim/after/spell/pl.iso-8859-2.add.spl
This assumes 1. is not found and 2. is found.
If 'encoding' is "latin1" Vim will look for:
1. ~/.vim/spell/pl.latin1.spl
-2. /usr/share/vim81/spell/pl.latin1.spl
+2. /usr/share/vim82/spell/pl.latin1.spl
3. ~/.vim/after/spell/pl.latin1.spl
4. ~/.vim/spell/pl.ascii.spl
-5. /usr/share/vim81/spell/pl.ascii.spl
+5. /usr/share/vim82/spell/pl.ascii.spl
6. ~/.vim/after/spell/pl.ascii.spl
This assumes none of them are found (Polish doesn't make sense when leaving
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 203276f..07f7dae 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -108,7 +108,7 @@
gvimdiff vim -gd Start in diff mode |diff-mode|
Additional characters may follow, they are ignored. For example, you can have
-"gvim-5" to start the GUI. You must have an executable by that name then, of
+"gvim-8" to start the GUI. You must have an executable by that name then, of
course.
On Unix, you would normally have one executable called Vim, and links from the
@@ -1140,12 +1140,12 @@
variable too (the default is "$VIMRUNTIME/doc/help.txt": chicken-egg
problem). The file name ("help.txt" or any other) is removed. Then
trailing directory names are removed, in this order: "doc", "runtime" and
- "vim{version}" (e.g., "vim54").
+ "vim{version}" (e.g., "vim82").
3. For Win32 Vim tries to use the directory name of the executable. If it
ends in "/src", this is removed. This is useful if you unpacked the .zip
file in some directory, and adjusted the search path to find the vim
executable. Trailing directory names are removed, in this order: "runtime"
- and "vim{version}" (e.g., "vim54").
+ and "vim{version}" (e.g., "vim82").
4. For Unix the compile-time defined installation directory is used (see the
output of ":version").
@@ -1163,7 +1163,7 @@
1. If the environment variable $VIMRUNTIME is set, it is used. You can use
this when the runtime files are in an unusual location.
2. If "$VIM/vim{version}" exists, it is used. {version} is the version
- number of Vim, without any '-' or '.'. For example: "$VIM/vim54". This is
+ number of Vim, without any '-' or '.'. For example: "$VIM/vim82". This is
the normal value for $VIMRUNTIME.
3. If "$VIM/runtime" exists, it is used.
4. The value of $VIM is used. This is for backwards compatibility with older
@@ -1175,11 +1175,11 @@
output of ":version"), steps 2, 3 and 4 are skipped, and the compiled-in
default is used after step 5. This means that the compiled-in default
overrules the value of $VIM. This is useful if $VIM is "/etc" and the runtime
-files are in "/usr/share/vim/vim54".
+files are in "/usr/share/vim/vim82".
Once Vim has done this once, it will set the $VIMRUNTIME environment variable.
To change it later, use a ":let" command like this: >
- :let $VIMRUNTIME = "/home/piet/vim/vim54"
+ :let $VIMRUNTIME = "/home/piet/vim/vim82"
In case you need the value of $VIMRUNTIME in a shell (e.g., for a script that
greps in the help files) you might be able to use this: >
@@ -1208,8 +1208,8 @@
buffers are not written, don't forget to bring Vim
back to the foreground later!
-In the GUI, suspending is implemented as iconising gvim. In Windows 95/NT,
-gvim is minimized.
+In the GUI, suspending is implemented as iconising gvim. In MS-Windows, gvim
+is minimized.
On many Unix systems, it is possible to suspend Vim with CTRL-Z. This is only
possible in Normal and Visual mode (see next chapter, |vim-modes|). Vim will
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index f8874c6..0246e7f 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -60,8 +60,8 @@
the path in another way (see |$VIMRUNTIME|). Usually this works just
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
-are in the "/usr/vim/vim81/syntax" directory, set $VIMRUNTIME to
-"/usr/vim/vim81". You must do this in the shell, before starting Vim.
+are in the "/usr/vim/vim82/syntax" directory, set $VIMRUNTIME to
+"/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
will start soon. See |'go-M'| about avoiding that.
diff --git a/runtime/doc/tags b/runtime/doc/tags
index a477c44..97934d7 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -7261,6 +7261,7 @@
i_CTRL-R_CTRL-O insert.txt /*i_CTRL-R_CTRL-O*
i_CTRL-R_CTRL-P insert.txt /*i_CTRL-R_CTRL-P*
i_CTRL-R_CTRL-R insert.txt /*i_CTRL-R_CTRL-R*
+i_CTRL-SHIFT-Q insert.txt /*i_CTRL-SHIFT-Q*
i_CTRL-SHIFT-V insert.txt /*i_CTRL-SHIFT-V*
i_CTRL-T insert.txt /*i_CTRL-T*
i_CTRL-U insert.txt /*i_CTRL-U*
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index 334bd2c..4bff365 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -579,7 +579,7 @@
versa.
*scroll-region*
-Some termcaps do not include an entry for 'cs' (scroll region), although the
+Some termcaps do not include an entry for "cs" (scroll region), although the
terminal does support it. For example: xterm on a Sun. You can use the
builtin_xterm or define t_cs yourself. For example: >
:set t_cs=^V^[[%i%d;%dr
@@ -596,11 +596,9 @@
Unfortunately it is not possible to deduce from the termcap how cursor
positioning should be done when using a scrolling region: Relative to the
beginning of the screen or relative to the beginning of the scrolling region.
-Most terminals use the first method. A known exception is the MS-Windows
-console (pcterm). The 't_CS' option should be set to any string when cursor
-positioning is relative to the start of the scrolling region. It should be
-set to an empty string otherwise. It defaults to "yes" when 'term' is
-"pcterm".
+Most terminals use the first method. The 't_CS' option should be set to any
+string when cursor positioning is relative to the start of the scrolling
+region. It should be set to an empty string otherwise.
Note for xterm users: The shifted cursor keys normally don't work. You can
make them work with the xmodmap command and some mappings in Vim.
@@ -652,15 +650,7 @@
:mod[e] [mode]
Without argument this only detects the screen size and redraws the screen.
-With MS-Windows it is possible to switch screen mode. [mode] can be one of
-these values:
- "bw40" 40 columns black&white
- "c40" 40 columns color
- "bw80" 80 columns black&white
- "c80" 80 columns color (most people use this)
- "mono" 80 columns monochrome
- "c4350" 43 or 50 lines EGA/VGA mode
- number mode number to use, depends on your video card
+[mode] was used on MS-DOS, but it doesn't work anymore.
==============================================================================
4. Slow and fast terminals *slow-fast-terminal*
@@ -911,8 +901,8 @@
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 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 MS-Windows 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.
An example, for using a double click to jump to the tag under the cursor: >
:map <2-LeftMouse> :exe "tag ". expand("<cword>")<CR>
diff --git a/runtime/doc/textprop.txt b/runtime/doc/textprop.txt
index 98dbfdf..2c6674f 100644
--- a/runtime/doc/textprop.txt
+++ b/runtime/doc/textprop.txt
@@ -1,4 +1,4 @@
-*textprop.txt* For Vim version 8.2. Last change: 2019 Dec 07
+*textprop.txt* For Vim version 8.2. Last change: 2020 Jan 10
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 7468b2a..41f9fc0 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 8.2. Last change: 2020 Jan 06
+*todo.txt* For Vim version 8.2. Last change: 2020 Jan 13
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -38,15 +38,8 @@
*known-bugs*
-------------------- Known bugs and current work -----------------------
-- Implement prop_find() issue #4970 Done by Ryan Hackett, #5421
-
Include ipv6 syntax changes? (DJ Lucas, #5360)
-Still have /* */ comments:
- misc1.c
- misc2.c
- others?
-
Popup windows:
- Make it possible to put a terminal window in a popup. Would always grab key
input? Sort-of possible by creating a hidden terminal and opening a popup
@@ -128,7 +121,7 @@
conversions.
Error numbers available:
-E362, E366, E450, E451, E452,
+E366, E450, E451, E452,
E453, E454, E460, E489, E491, E565, E578, E610, E611, E653,
E654, E856, E857, E860, E861, E863, E889, E900
@@ -149,6 +142,9 @@
undo result wrong: Masato Nishihata, #4798
+Patch to add function to return the text used in the quickfix window.
+(Yegappan, #5465)
+
Undo puts cursor in wrong line after "cG<Esc>" undo.
:unmap <c-n> gives error but does remove the mapping. (Antony Scriven, 2019
@@ -163,6 +159,12 @@
Also #4994: window-local options not always restored, related to using :badd.
Also #5326: netrw buffers are not restored.
+Patch to support cindent option to handle pragmas differently.
+(Max Rumpf, #5468)
+
+Patch to make ":verbose pwd" show the scope of the directory. (Takuya
+Fujiwara, #5469)
+
Completion mixes results from the current buffer with tags and other files.
Happens when typing CTRL-N while still searching for results. E.g., type "b_"
in terminal.c and then CTRL-N twice.
@@ -182,6 +184,9 @@
goes to any buffer, and then :bnext skips help buffers, since they are
unlisted. (#4478)
+Patch to provide search stats in a variable, so that it can be used in the
+statusline. (Fujiwara Takuya, #4446)
+
Enable 'termbidi' if $VTE_VERSION >= 5703 ?
Universal solution to detect if t_RS is working, using cursor position.
@@ -246,6 +251,9 @@
Also see issue #609.
We could add the enable/disable sequences to t_ti/t_te or t_ks/t_ke.
+:buffer completion does not escape "+" properly and results in a regexp error.
+(#5467)
+
Check_external_diff() is used too often. (Daniel Hahler, #4800)
Win32: after "[I" showing matches, scroll wheel messes up screen. (Tsakiridis,
@@ -1282,10 +1290,6 @@
Assume the system converts between the actual encoding of the filesystem to
the system encoding (usually utf-8).
-Using ":tab drop file" does not trigger BufEnter or TabEnter events.
-(Andy Stewart, 2017 Apr 27, #1660)
-Autocommands blocked in do_arg_all(). Supposed to happen later?
-
'hlsearch' interferes with a Conceal match. (Rom Grk, 2016 Aug 9)
MS-Windows: use WS_HIDE instead of SW_SHOWMINNOACTIVE in os_win32.c?
diff --git a/runtime/doc/usr_44.txt b/runtime/doc/usr_44.txt
index 82d9904..61f9b2f 100644
--- a/runtime/doc/usr_44.txt
+++ b/runtime/doc/usr_44.txt
@@ -673,21 +673,10 @@
finish
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
that included files do this too, you might have to reset "b:current_syntax" if
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',
'expandtab', etc. These belong in a filetype plugin.
diff --git a/runtime/doc/usr_90.txt b/runtime/doc/usr_90.txt
index d182703..074d353 100644
--- a/runtime/doc/usr_90.txt
+++ b/runtime/doc/usr_90.txt
@@ -64,20 +64,11 @@
Or use the home site ftp.vim.org, if you think it's fast enough. Go to the
"unix" directory and you'll find a list of files there. The version number is
embedded in the file name. You will want to get the most recent version.
- You can get the files for Unix in two ways: One big archive that contains
-everything, or four smaller ones that each fit on a floppy disk. For version
-6.1 the single big one is called:
+ You can get the files for Unix in one big archive that contains everything:
- vim-6.1.tar.bz2 ~
+ vim-8.2.tar.bz2 ~
-You need the bzip2 program to uncompress it. If you don't have it, get the
-four smaller files, which can be uncompressed with gzip. For Vim 6.1 they are
-called:
-
- vim-6.1-src1.tar.gz ~
- vim-6.1-src2.tar.gz ~
- vim-6.1-rt1.tar.gz ~
- vim-6.1-rt2.tar.gz ~
+You need the bzip2 program to uncompress it.
COMPILING
@@ -87,22 +78,19 @@
mkdir ~/vim
cd ~/vim
-Then unpack the archives there. If you have the one big archive, you unpack
-it like this: >
+Then unpack the archives there. You can unpack it like this: >
- bzip2 -d -c path/vim-6.1.tar.bz2 | tar xf -
+ tar xf path/vim-8.2.tar.bz2
-Change "path" to where you have downloaded the file. >
+If your tar command doesn't support bz2 directly: >
- gzip -d -c path/vim-6.1-src1.tar.gz | tar xf -
- gzip -d -c path/vim-6.1-src2.tar.gz | tar xf -
- gzip -d -c path/vim-6.1-rt1.tar.gz | tar xf -
- gzip -d -c path/vim-6.1-rt2.tar.gz | tar xf -
+ bzip2 -d -c path/vim-8.2.tar.bz2 | tar xf -
+Change "path" to where you have downloaded the file.
If you are satisfied with getting the default features, and your environment
is setup properly, you should be able to compile Vim with just this: >
- cd vim61/src
+ cd vim82/src
make
The make program will run configure and compile everything. Further on we
@@ -231,9 +219,9 @@
Or use the home site ftp.vim.org, if you think it's fast enough. Go to the
"pc" directory and you'll find a list of files there. The version number is
embedded in the file name. You will want to get the most recent version.
-We will use "61" here, which is version 6.1.
+We will use "82" here, which is version 8.2.
- gvim61.exe The self-installing archive.
+ gvim82.exe The self-installing archive.
This is all you need for the second method. Just launch the executable, and
follow the prompts.
@@ -241,30 +229,28 @@
For the first method you must chose one of the binary archives. These are
available:
- gvim61.zip The normal MS-Windows GUI version.
- gvim61ole.zip The MS-Windows GUI version with OLE support.
+ gvim82.zip The normal MS-Windows GUI version.
+ gvim82ole.zip The MS-Windows GUI version with OLE support.
Uses more memory, supports interfacing with
other OLE applications.
- vim61w32.zip 32 bit MS-Windows console version. For use in
- a Win NT/2000/XP console. Does not work well
- on Win 95/98.
+ vim82w32.zip 32 bit MS-Windows console version.
You only need one of them. Although you could install both a GUI and a
console version. You always need to get the archive with runtime files.
- vim61rt.zip The runtime files.
+ vim82rt.zip The runtime files.
Use your un-zip program to unpack the files. For example, using the "unzip"
program: >
cd c:\
- unzip path\gvim61.zip
- unzip path\vim61rt.zip
+ unzip path\gvim82.zip
+ unzip path\vim82rt.zip
-This will unpack the files in the directory "c:\vim\vim61". If you already
+This will unpack the files in the directory "c:\vim\vim82". If you already
have a "vim" directory somewhere, you will want to move to the directory just
above it.
- Now change to the "vim\vim61" directory and run the install program: >
+ Now change to the "vim\vim82" directory and run the install program: >
install
@@ -277,8 +263,8 @@
In case you are not satisfied with the features included in the supplied
binaries, you could try compiling Vim yourself. Get the source archive from
the same location as where the binaries are. You need a compiler for which a
-makefile exists. Microsoft Visual C works, but is expensive. The free MinGW
-and Cygwin compilers can be used. Check the file src/INSTALLpc.txt for hints.
+makefile exists. Microsoft Visual C, MinGW and Cygwin compilers can be used.
+Check the file src/INSTALLpc.txt for hints.
==============================================================================
*90.3* Upgrading
@@ -298,7 +284,7 @@
delete the old runtime files manually. Just delete the directory with the
version number in it and all files below it. Example: >
- rm -rf /usr/local/share/vim/vim58
+ rm -rf /usr/local/share/vim/vim74
There are normally no changed files below this directory. If you did change
the "filetype.vim" file, for example, you better merge the changes into the
@@ -308,21 +294,21 @@
switching to it, install the new version under another name. You need to
specify a configure argument. For example: >
- ./configure --with-vim-name=vim6
+ ./configure --with-vim-name=vim8
Before running "make install", you could use "make -n install" to check that
no valuable existing files are overwritten.
When you finally decide to switch to the new version, all you need to do is
to rename the binary to "vim". For example: >
- mv /usr/local/bin/vim6 /usr/local/bin/vim
+ mv /usr/local/bin/vim8 /usr/local/bin/vim
MS-WINDOWS
Upgrading is mostly equal to installing a new version. Just unpack the files
in the same place as the previous version. A new directory will be created,
-e.g., "vim61", for the files of the new version. Your runtime files, vimrc
+e.g., "vim82", for the files of the new version. Your runtime files, vimrc
file, viminfo, etc. will be left alone.
If you want to run the new version next to the old one, you will have to do
some handwork. Don't run the install program, it will overwrite a few files
@@ -428,7 +414,7 @@
someone supplied, you can't do this. Do delete the files manually, here is an
example for when "/usr/local" was used as the root: >
- rm -rf /usr/local/share/vim/vim61
+ rm -rf /usr/local/share/vim/vim82
rm /usr/local/bin/eview
rm /usr/local/bin/evim
rm /usr/local/bin/ex
@@ -467,7 +453,7 @@
If you installed Vim with the self-installing archive you can run
the "uninstall-gui" program located in the same directory as the other Vim
-programs, e.g. "c:\vim\vim61". You can also launch it from the Start menu if
+programs, e.g. "c:\vim\vim82". You can also launch it from the Start menu if
installed the Vim entries there. This will remove most of the files, menu
entries and desktop shortcuts. Some files may remain however, as they need a
Windows restart before being deleted.
@@ -477,10 +463,10 @@
Else, if you installed Vim with the zip archives, the preferred way is to use
the "uninstall" program. You can find it in the same directory as the
-"install" program, e.g., "c:\vim\vim61". This should also work from the usual
+"install" program, e.g., "c:\vim\vim82". This should also work from the usual
"install/remove software" page.
However, this only removes the registry entries for Vim. You have to
-delete the files yourself. Simply select the directory "vim\vim61" and delete
+delete the files yourself. Simply select the directory "vim\vim82" and delete
it recursively. There should be no files there that you changed, but you
might want to check that first.
The "vim" directory probably contains your vimrc file and other runtime
diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt
index f8949f6..69c6c5d 100644
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -133,14 +133,10 @@
- All Unix systems (it works on all systems it was tested on, although
the GUI and Perl interface may not work everywhere).
- Amiga (500, 1000, 1200, 2000, 3000, 4000, ...).
- - MS-DOS in real-mode (no additional drivers required).
- - In protected mode on Windows 3.1 and MS-DOS (DPMI driver required).
- - Windows 95 and Windows NT, with support for long file names.
- - OS/2 (needs emx.dll)
+ - MS-Windows
- VMS
- BeOS
- Macintosh
- - Risc OS
- IBM OS/390
Note that on some systems features need to be disabled to reduce
resource usage. For some outdated systems you need to use an older