aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-08-01 22:59:21 +0200
committerJustin M. Keyes <justinkz@gmail.com>2019-08-01 23:12:33 +0200
commitf379eac1ef9926ecefab7302f876c7c93b5cca74 (patch)
tree61d150a6f199d08795bc6170bc0aeb09941b47a2
parent4d830ca31bd4346bd2cced48f056414162fa00a3 (diff)
downloadrneovim-f379eac1ef9926ecefab7302f876c7c93b5cca74.tar.gz
rneovim-f379eac1ef9926ecefab7302f876c7c93b5cca74.tar.bz2
rneovim-f379eac1ef9926ecefab7302f876c7c93b5cca74.zip
vim-patch:911ead126903
Update runtime files https://github.com/vim/vim/commit/911ead126903aeb9564bad89e46a147ed4959896 NA: vim-patch:602abeb20fb7
-rw-r--r--runtime/doc/autocmd.txt2
-rw-r--r--runtime/doc/options.txt4
-rw-r--r--runtime/doc/print.txt6
-rw-r--r--runtime/ftplugin/dosbatch.vim3
4 files changed, 9 insertions, 6 deletions
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index ffd9133ef5..e37fe9e5ce 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -597,7 +597,7 @@ CompleteChanged *CompleteChanged*
recursively.
Sets these |v:event| keys:
- completed_item
+ completed_item See |complete-items|.
height nr of items visible
width screen cells
row top screen row
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 8881f12f47..9a3daa494a 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1819,6 +1819,7 @@ A jump table for the options with a short description can be found at |Q_op|.
< When using the ":set" command, you need to double the backslashes!
To avoid that use `:let` with a single quote string: >
let &l:define = '^\s*\ze\k\+\s*=\s*function('
+<
*'delcombine'* *'deco'* *'nodelcombine'* *'nodeco'*
'delcombine' 'deco' boolean (default off)
@@ -5614,7 +5615,8 @@ A jump table for the options with a short description can be found at |Q_op|.
set spelllang=en_us,nl,medical
< This means US English, Dutch and medical words are recognized. Words
that are not recognized will be highlighted.
- The word list name must not include a comma or dot. Using a dash is
+ The word list name must consist of alphanumeric characters, a dash or
+ an underscore. It should not include a comma or dot. Using a dash is
recommended to separate the two letter language name from a
specification. Thus "en-rare" is used for rare English words.
A region name must come last and have the form "_xx", where "xx" is
diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt
index a341ce9652..b6d781c1ca 100644
--- a/runtime/doc/print.txt
+++ b/runtime/doc/print.txt
@@ -237,9 +237,9 @@ possible. The following tables show the valid combinations:
Japanese JIS_C_1978 x x
JIS_X_1983 x x
JIS_X_1990 x x x
- MSWINDOWS x
- KANJITALK6 x
- KANJITALK7 x
+ MSWINDOWS x
+ KANJITALK6 x
+ KANJITALK7 x
euc-kr cp949 ucs-2 utf-8 ~
Korean KS_X_1992 x
diff --git a/runtime/ftplugin/dosbatch.vim b/runtime/ftplugin/dosbatch.vim
index dbc02d80f8..070bdc4ba2 100644
--- a/runtime/ftplugin/dosbatch.vim
+++ b/runtime/ftplugin/dosbatch.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: MS-DOS .bat files
" Maintainer: Mike Williams <mrw@eandem.co.uk>
-" Last Change: 8th May 2012
+" Last Change: 14th April 2019
" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
@@ -16,6 +16,7 @@ set cpo&vim
" BAT comment formatting
setlocal comments=b:rem,b:@rem,b:REM,b:@REM,:::
+setlocal commentstring=::\ %s
setlocal formatoptions-=t formatoptions+=rol
" Define patterns for the browse file filter