diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-04-29 01:53:03 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-04-29 01:53:42 +0200 |
| commit | 024ff6b80831a27d2f6571006eb6fdf94d95f882 (patch) | |
| tree | 1c4a520069712e978c0ffb9eaa1d8ee771be304d | |
| parent | 789c46934b2089782fb0115493513bd0cc6f7388 (diff) | |
| download | rneovim-024ff6b80831a27d2f6571006eb6fdf94d95f882.tar.gz rneovim-024ff6b80831a27d2f6571006eb6fdf94d95f882.tar.bz2 rneovim-024ff6b80831a27d2f6571006eb6fdf94d95f882.zip | |
vim-patch:25de4c232d58
Updated runtime files.
https://github.com/vim/vim/commit/25de4c232d580583feadae11ab34e3cc6333c350
| -rw-r--r-- | runtime/doc/eval.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/quickfix.txt | 2 | ||||
| -rw-r--r-- | runtime/filetype.vim | 5 | ||||
| -rw-r--r-- | runtime/syntax/synload.vim | 9 |
4 files changed, 12 insertions, 6 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 2d6c6ee3a0..30fd75c447 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -2473,7 +2473,7 @@ assert_exception({error} [, {msg}]) *assert_exception()* assert_fails({cmd} [, {error}]) *assert_fails()* Run {cmd} and add an error message to |v:errors| if it does NOT produce an error. - When {error} is given it must match |v:errmsg|. + When {error} is given it must match in |v:errmsg|. assert_false({actual} [, {msg}]) *assert_false()* When {actual} is not false an error message is added to diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index 1bc5c31281..d9f6b2c39d 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -872,7 +872,7 @@ need to write down a "todo" list. The Vim plugins in the "compiler" directory will set options to use the -selected compiler. For ":compiler" local options are set, for ":compiler!" +selected compiler. For `:compiler` local options are set, for `:compiler!` global options. *current_compiler* To support older Vim versions, the plugins always use "current_compiler" and diff --git a/runtime/filetype.vim b/runtime/filetype.vim index d8a9a8e4ab..3e502ca362 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2016 Oct 28 +" Last Change: 2016 Oct 31 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -2670,6 +2670,9 @@ au BufNewFile,BufRead mutt{ng,}rc*,Mutt{ng,}rc* call s:StarSetf('muttrc') " Nroff macros au BufNewFile,BufRead tmac.* call s:StarSetf('nroff') +" OpenBSD hostname.if +au BufNewFile,BufRead /etc/hostname.* call s:StarSetf('config') + " Pam conf au BufNewFile,BufRead */etc/pam.d/* call s:StarSetf('pamconf') diff --git a/runtime/syntax/synload.vim b/runtime/syntax/synload.vim index 6183f33a59..ab918c645b 100644 --- a/runtime/syntax/synload.vim +++ b/runtime/syntax/synload.vim @@ -1,6 +1,6 @@ " Vim syntax support file " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2012 Sep 25 +" Last Change: 2016 Nov 04 " This file sets up for syntax highlighting. " It is loaded from "syntax.vim" and "manual.vim". @@ -69,8 +69,11 @@ au Syntax c,cpp,cs,idl,java,php,datascript " Source the user-specified syntax highlighting file -if exists("mysyntaxfile") && filereadable(expand(mysyntaxfile)) - execute "source " . mysyntaxfile +if exists("mysyntaxfile") + let s:fname = expand(mysyntaxfile) + if filereadable(s:fname) + execute "source " . fnameescape(s:fname) + endif endif " Restore 'cpoptions' |