summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Reif <dan.reif@collectivehealth.com>2018-05-08 10:17:30 -0700
committerDan Reif <dan.reif@collectivehealth.com>2018-05-08 10:17:30 -0700
commite13e64d9c43b23733ea436710aa4d022cd241ea2 (patch)
tree8bbe8c14692c1a9698984d3ca88b1723db71dd71
parent17a69ab565baf94e7e6e77894f0bb040194e6280 (diff)
downloadvim-polyglot-e13e64d9c43b23733ea436710aa4d022cd241ea2.tar.gz
vim-polyglot-e13e64d9c43b23733ea436710aa4d022cd241ea2.zip
Update (periodic rebuild)
-rw-r--r--indent/julia.vim2
-rw-r--r--syntax/vifm.vim13
2 files changed, 12 insertions, 3 deletions
diff --git a/indent/julia.vim b/indent/julia.vim
index 88e90e57..6382ec2e 100644
--- a/indent/julia.vim
+++ b/indent/julia.vim
@@ -21,7 +21,7 @@ if exists("*GetJuliaIndent")
finish
endif
-let s:skipPatterns = '\<julia\%(Comprehension\%(For\|If\)\|RangeEnd\|CommentL\|\%([bsv]\|ip\|big\|MIME\|Shell\|Printf\|Doc\)\=String\|RegEx\|SymbolS\?\)\>'
+let s:skipPatterns = '\<julia\%(Comprehension\%(For\|If\)\|RangeEnd\|Comment[LM]\|\%([bsv]\|ip\|big\|MIME\|Shell\|Printf\|Doc\)\=String\|RegEx\|SymbolS\?\)\>'
function JuliaMatch(lnum, str, regex, st, ...)
let s = a:st
diff --git a/syntax/vifm.vim b/syntax/vifm.vim
index 9eae9a92..8843d1ac 100644
--- a/syntax/vifm.vim
+++ b/syntax/vifm.vim
@@ -2,7 +2,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
" vifm syntax file
" Maintainer: xaizek <xaizek@posteo.net>
-" Last Change: April 18, 2018
+" Last Change: April 30, 2018
" Inspired By: Vim syntax file by Dr. Charles E. Campbell, Jr.
if exists('b:current_syntax')
@@ -176,7 +176,7 @@ syntax region vifmStatementC start='\(\s\|:\)*'
\,vifmComment,vifmInlineComment,vifmNotComment,vifmExprCommandSt,vifmNormalCommandSt
\,vifmCdCommandSt,vifmSet,vifmArgument,vifmSoCommand,vifmSoCommandSt
\,vifmInvertCommand,vifmInvertCommandSt,vifmPrefixCommands
- \,vifmAutocmdCommand,vifmAutoEvent,vifmPatternCommands
+ \,vifmAutocmdCommand,vifmAutoEvent,vifmPatternCommands,vifmLetC,vifmUnletC
syntax region vifmCmdCommandSt start='^\(\s\|:\)*com\%[mand]\>'
\ skip='\(\n\s*\\\)\|\(\n\s*".*$\)' end='$' keepend
\ contains=vifmCmdCommand,vifmComment,vifmInlineComment,vifmNotComment
@@ -353,10 +353,19 @@ syntax region vifmLet
\ keepend
\ contains=vifmLetCommand,vifmEnvVar,vifmString,vifmStringInExpr,vifmComment
\,vifmInlineComment,vifmNotComment
+syntax region vifmLetC
+ \ start='\<let\>' skip='\(\n\s*\\\)\|\(\n\s*".*$\)' end='$\||'
+ \ keepend
+ \ contains=vifmLetCommand,vifmEnvVar,vifmString,vifmStringInExpr,vifmComment
+ \,vifmInlineComment,vifmNotComment,vifmBuiltinFunction
syntax region vifmUnlet
\ start='^\(\s\|:\)*\<unl\%[et]\>' skip='\(\n\s*\\\)\|\(\n\s*".*$\)' end='$'
\ keepend
\ contains=vifmUnletCommand,vifmEnvVar,vifmComment,vifmInlineComment,vifmNotComment
+syntax region vifmUnletC
+ \ start='\<unl\%[et]\>' skip='\(\n\s*\\\)\|\(\n\s*".*$\)' end='$\||'
+ \ keepend
+ \ contains=vifmUnletCommand,vifmEnvVar,vifmComment,vifmInlineComment,vifmNotComment
syntax region vifmString contained start=+="+hs=s+1 skip=+\\\\\|\\"+ end=+"+
syntax region vifmString contained start=+='+hs=s+1 skip=+\\\\\|\\'+ end=+'+
syntax region vifmStringInExpr contained start=+=\@<="+hs=s+1 skip=+\\\\\|\\"+