Skip to content

Commit

Permalink
vim-patch:25de4c232d58
Browse files Browse the repository at this point in the history
Updated runtime files.

vim/vim@25de4c2
  • Loading branch information
justinmk committed Apr 28, 2017
1 parent 789c469 commit 024ff6b
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion runtime/doc/eval.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion runtime/doc/quickfix.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion runtime/filetype.vim
Original file line number Diff line number Diff line change
@@ -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")
Expand Down Expand Up @@ -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')

Expand Down
9 changes: 6 additions & 3 deletions runtime/syntax/synload.vim
Original file line number Diff line number Diff line change
@@ -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".
Expand Down Expand Up @@ -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'
Expand Down

0 comments on commit 024ff6b

Please sign in to comment.