diff options
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | vim/after/ftplugin/html/url_link.vim | 4 | ||||
-rw-r--r-- | vim/after/syntax/sh.vim | 15 | ||||
-rw-r--r-- | vim/plugin/auto_undodir.vim | 2 |
4 files changed, 20 insertions, 5 deletions
@@ -1,2 +1,2 @@ -tejr dotfiles v0.17.0 -Mon Nov 13 21:09:10 UTC 2017 +tejr dotfiles v0.17.2 +Tue Nov 14 22:20:41 UTC 2017 diff --git a/vim/after/ftplugin/html/url_link.vim b/vim/after/ftplugin/html/url_link.vim index 4f2d2526..85e9d719 100644 --- a/vim/after/ftplugin/html/url_link.vim +++ b/vim/after/ftplugin/html/url_link.vim @@ -10,8 +10,8 @@ if exists('b:undo_ftplugin') endif " Make a bare URL into a link to itself -if !exists('*s:UrlLink') - function! s:UrlLink() +if !exists('*s:HtmlUrlLink') + function! s:HtmlUrlLink() " Yank this whole whitespace-separated word normal! yiW diff --git a/vim/after/syntax/sh.vim b/vim/after/syntax/sh.vim index 8025c567..4d56d3a8 100644 --- a/vim/after/syntax/sh.vim +++ b/vim/after/syntax/sh.vim @@ -119,6 +119,21 @@ if exists('b:is_posix') syntax cluster shCaseList add=shRepeat syntax cluster shFunctionList add=shRepeat + " ${foo%bar}, ${foo%%bar}, ${foo#bar}, and ${foo##bar} are all valid forms + " of parameter expansion in POSIX, but sh.vim makes them conditional on + " Bash or Korn shell. We reinstate them (slightly adapted) here. + syn match shDerefOp contained + \ '##\|#\|%%\|%' + \ nextgroup=@shDerefPatternList + syn match shDerefPattern contained + \ '[^{}]\+' + \ contains=shDeref,shDerefSimple,shDerefPattern,shDerefString,shCommandSub,shDerefEscape + \ nextgroup=shDerefPattern + syn region shDerefPattern contained + \ start='{' end='}' + \ contains=shDeref,shDerefSimple,shDerefString,shCommandSub + \ nextgroup=shDerefPattern + endif " Some corrections for highlighting specific to the Bash mode diff --git a/vim/plugin/auto_undodir.vim b/vim/plugin/auto_undodir.vim index 0cd54cd0..4382fe18 100644 --- a/vim/plugin/auto_undodir.vim +++ b/vim/plugin/auto_undodir.vim @@ -36,7 +36,7 @@ if !isdirectory(expand(s:undodir)) " Failing that, use an OS-dependent command " (Fortunately, Unix and Windows are the only OS types in the world) elseif has('*shellescape') - elseif has('unix') + if has('unix') silent! execute '!mkdir -m 0700 -p ' \ . shellescape(expand(s:undodir)) elseif has('win32') || has('win64') |