diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2018-10-29 09:29:42 +0100 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2018-10-29 09:32:29 +0100 |
commit | 93a85bdd8a9f5086eb205a3235ec17acc0bf498c (patch) | |
tree | 4f23ab514a0330cfac05952564d3ed0870701d2e /runtime | |
parent | 9da951ad47c97175e1efa520e582a26f0db1e1cf (diff) | |
download | rneovim-93a85bdd8a9f5086eb205a3235ec17acc0bf498c.tar.gz rneovim-93a85bdd8a9f5086eb205a3235ec17acc0bf498c.tar.bz2 rneovim-93a85bdd8a9f5086eb205a3235ec17acc0bf498c.zip |
vim-patch:d2f3a8b87873
Update runtime files.
https://github.com/vim/vim/commit/d2f3a8b8787333abf2300d38836b196955f10c00
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/doc/autocmd.txt | 7 | ||||
-rw-r--r-- | runtime/doc/cmdline.txt | 3 | ||||
-rw-r--r-- | runtime/doc/ft_ada.txt | 2 | ||||
-rw-r--r-- | runtime/doc/ft_rust.txt | 4 | ||||
-rw-r--r-- | runtime/doc/insert.txt | 4 | ||||
-rw-r--r-- | runtime/doc/syntax.txt | 2 | ||||
-rw-r--r-- | runtime/syntax/debcontrol.vim | 6 | ||||
-rw-r--r-- | runtime/syntax/html.vim | 27 | ||||
-rw-r--r-- | runtime/tools/check_colors.vim | 2 |
9 files changed, 43 insertions, 14 deletions
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index bb9022fb21..bacd0e7cf1 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -666,7 +666,10 @@ FileChangedRO Before making the first change to a read-only ExitPre When using `:quit`, `:wq` in a way it makes Vim exit, or using `:qall`, just after |QuitPre|. Can be used to close any - non-essential window. + non-essential window. Exiting may still be + cancelled if there is a modified buffer that + isn't automatically saved, use |VimLeavePre| + for really exiting. *FileChangedShell* FileChangedShell When Vim notices that the modification time of a file has changed since editing started. @@ -1377,7 +1380,7 @@ Careful: '[ and '] change when using commands that change the buffer. In commands which expect a file name, you can use "<afile>" for the file name that is being read |:<afile>| (you can also use "%" for the current file name). "<abuf>" can be used for the buffer number of the currently effective -buffer. This also works for buffers that doesn't have a name. But it doesn't +buffer. This also works for buffers that don't have a name. But it doesn't work for files without a buffer (e.g., with ":r file"). *gzip-example* diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index 48229d8991..d833536820 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -844,7 +844,8 @@ These modifiers can be given, in this order: directory. :. Reduce file name to be relative to current directory, if possible. File name is unmodified if it is not below the - current directory. + current directory, but on MS-Windows the drive is removed if + it is the current drive. For maximum shortness, use ":~:.". :h Head of the file name (the last component and any separators removed). Cannot be used with :e, :r or :t. diff --git a/runtime/doc/ft_ada.txt b/runtime/doc/ft_ada.txt index c1aa0904c4..771ccc3302 100644 --- a/runtime/doc/ft_ada.txt +++ b/runtime/doc/ft_ada.txt @@ -249,7 +249,7 @@ g:decada.Make_Command string External command used for |g:decada.Make()| (|'makeprg'|). *g:decada.Error_Format* -g:decada.Error_Format| string +g:decada.Error_Format string Error format (|'errorformat'|). ============================================================================== diff --git a/runtime/doc/ft_rust.txt b/runtime/doc/ft_rust.txt index 750ba76afc..b94e1f8f75 100644 --- a/runtime/doc/ft_rust.txt +++ b/runtime/doc/ft_rust.txt @@ -1,4 +1,6 @@ -*ft_rust.txt* Filetype plugin for Rust +*ft_rust.txt* For Vim version 8.1. Last change: 2017 Nov 02 + +This is documentation for the Rust filetype plugin. ============================================================================== CONTENTS *rust* diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index 06284fb849..24106dec42 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -411,11 +411,11 @@ An example for using CTRL-G U: > This makes it possible to use the cursor keys in Insert mode, without breaking the undo sequence and therefore using |.| (redo) will work as expected. -Also entering a text like (with the "(" mapping from above): > +Also entering a text like (with the "(" mapping from above): Lorem ipsum (dolor -will be repeatable by the |.|to the expected +will be repeatable by using |.| to the expected Lorem ipsum (dolor) diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 57042f06d4..eae7f0ab08 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1947,7 +1947,7 @@ set "lite_minlines" to the value you desire. Example: > LPC *lpc.vim* *ft-lpc-syntax* -LPC stands for a simple, memory-efficient language: Lars Pensj| C. The +LPC stands for a simple, memory-efficient language: Lars Pensjö C. The file name of LPC is usually *.c. Recognizing these files as LPC would bother users writing only C programs. If you want to use LPC syntax in Vim, you should set a variable in your vimrc file: > diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim index 3504780445..e630373c70 100644 --- a/runtime/syntax/debcontrol.vim +++ b/runtime/syntax/debcontrol.vim @@ -3,7 +3,7 @@ " Maintainer: Debian Vim Maintainers " Former Maintainers: Gerfried Fuchs <alfie@ist.org> " Wichert Akkerman <wakkerma@debian.org> -" Last Change: 2018 Jan 28 +" Last Change: 2018 May 31 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debcontrol.vim " Standard syntax initialization @@ -40,8 +40,8 @@ let s:pairs = [ " Define some common expressions we can use later on syn keyword debcontrolArchitecture contained all any -exe 'syn keyword debcontrolArchitecture contained '. join(map(s:kernels, {k,v -> v .'-any'})) -exe 'syn keyword debcontrolArchitecture contained '. join(map(s:archs, {k,v -> 'any-'.v})) +exe 'syn keyword debcontrolArchitecture contained '. join(map(copy(s:kernels), {k,v -> v .'-any'})) +exe 'syn keyword debcontrolArchitecture contained '. join(map(copy(s:archs), {k,v -> 'any-'.v})) exe 'syn keyword debcontrolArchitecture contained '. join(s:archs) exe 'syn keyword debcontrolArchitecture contained '. join(s:pairs) diff --git a/runtime/syntax/html.vim b/runtime/syntax/html.vim index 991fd8af39..cde5269d02 100644 --- a/runtime/syntax/html.vim +++ b/runtime/syntax/html.vim @@ -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: 2017 Dec 16 -" Included patch from Jorge Maldonado Ventura to add the dialog element +" Last Change: 2018 May 31 +" Included patch from Jay Sitter to add WAI-ARIA htmlArg keywords " " Please check :help html.vim for some comments and a description of the options @@ -77,6 +77,29 @@ syn keyword htmlArg contained size src start target text type url syn keyword htmlArg contained usemap ismap valign value vlink vspace width wrap syn match htmlArg contained "\<\(http-equiv\|href\|title\)="me=e-1 +" aria attributes +syn match htmlArg contained "\<\(aria-activedescendant\|aria-atomic\)\>" +syn match htmlArg contained "\<\(aria-autocomplete\|aria-busy\|aria-checked\)\>" +syn match htmlArg contained "\<\(aria-colcount\|aria-colindex\|aria-colspan\)\>" +syn match htmlArg contained "\<\(aria-controls\|aria-current\)\>" +syn match htmlArg contained "\<\(aria-describedby\|aria-details\)\>" +syn match htmlArg contained "\<\(aria-disabled\|aria-dropeffect\)\>" +syn match htmlArg contained "\<\(aria-errormessage\|aria-expanded\)\>" +syn match htmlArg contained "\<\(aria-flowto\|aria-grabbed\|aria-haspopup\)\>" +syn match htmlArg contained "\<\(aria-hidden\|aria-invalid\)\>" +syn match htmlArg contained "\<\(aria-keyshortcuts\|aria-label\)\>" +syn match htmlArg contained "\<\(aria-labelledby\|aria-level\|aria-live\)\>" +syn match htmlArg contained "\<\(aria-modal\|aria-multiline\)\>" +syn match htmlArg contained "\<\(aria-multiselectable\|aria-orientation\)\>" +syn match htmlArg contained "\<\(aria-owns\|aria-placeholder\|aria-posinset\)\>" +syn match htmlArg contained "\<\(aria-pressed\|aria-readonly\|aria-relevant\)\>" +syn match htmlArg contained "\<\(aria-required\|aria-roledescription\)\>" +syn match htmlArg contained "\<\(aria-rowcount\|aria-rowindex\|aria-rowspan\)\>" +syn match htmlArg contained "\<\(aria-selected\|aria-setsize\|aria-sort\)\>" +syn match htmlArg contained "\<\(aria-valuemax\|aria-valuemin\)\>" +syn match htmlArg contained "\<\(aria-valuenow\|aria-valuetext\)\>" +syn keyword htmlArg contained role + " Netscape extensions syn keyword htmlTagName contained frame noframes frameset nobr blink syn keyword htmlTagName contained layer ilayer nolayer spacer diff --git a/runtime/tools/check_colors.vim b/runtime/tools/check_colors.vim index 6c5e8f3c0f..b1aefa1126 100644 --- a/runtime/tools/check_colors.vim +++ b/runtime/tools/check_colors.vim @@ -90,7 +90,7 @@ func! Test_check_colors() let err['background'] = 'Should not issue :syn on' endif - " 7) Does not define filetype specfic groups like vimCommand, htmlTag, + " 7) Does not define filetype specific groups like vimCommand, htmlTag, let hi_groups = ['vim', 'html', 'python', 'sh', 'ruby'] for group in hi_groups let pat='\Chi\%[ghlight]\s*\zs'.group.'\w\+\>' |