diff options
Diffstat (limited to 'vim')
| -rw-r--r-- | vim/after/syntax/sh.vim | 16 | ||||
| -rw-r--r-- | vim/after/syntax/vim.vim | 2 | ||||
| -rw-r--r-- | vim/vimrc.stub.vim | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/vim/after/syntax/sh.vim b/vim/after/syntax/sh.vim index bdedaf65..95ec5546 100644 --- a/vim/after/syntax/sh.vim +++ b/vim/after/syntax/sh.vim @@ -20,12 +20,12 @@ endif syntax clear shDerefWordError " The syntax highlighter doesn't match parens for subshells for 'if' tests -" correctly if they're on separate lines. This happens enough that it's +" correctly if they're on separate lines. This happens enough that it's " probably not worth keeping the error. syntax clear shParenError " The syntax highlighter flags this code with an error on the final square -" bracket: `case $foo in [![:ascii:]]) ;; esac`, but that's all legal. I'm not +" bracket: `case $foo in [![:ascii:]]) ;; esac`, but that's all legal. I'm not " yet sure how to fix it, so will just turn the error group for now. syntax clear shTestError @@ -33,8 +33,8 @@ syntax clear shTestError if exists('b:is_posix') " Highlight some commands that are both defined by POSIX and builtin - " commands in dash, as a rough but useable proxy for 'shell builtins'. This - " list was mostly wrested from `man 1 dash`. Also include control structure + " commands in dash, as a rough but useable proxy for 'shell builtins'. This + " list was mostly wrested from `man 1 dash`. Also include control structure " keywords like `break`, `continue`, and `return`. syntax clear shStatement syntax cluster shCommandSubList add=shStatement @@ -76,7 +76,7 @@ if exists('b:is_posix') " Core syntax/sh.vim puts IFS and other variables that affect shell function " in another color, but a subset of them actually apply to POSIX shell too - " (and plain Bourne). These are selected by searching the POSIX manpages. I + " (and plain Bourne). These are selected by searching the POSIX manpages. I " added NLSPATH too, which wasn't in the original. syntax clear shShellVariables syntax cluster shCommandSubList add=shShellVariables @@ -112,7 +112,7 @@ if exists('b:is_posix') \ PWD " Core syntax/sh.vim thinks 'until' is a POSIX control structure keyword, - " but it isn't. Reset shRepeat and rebuild it with just 'while'. I only + " but it isn't. Reset shRepeat and rebuild it with just 'while'. I only " sort-of understand what this does, but it works. syntax clear shRepeat syntax region shRepeat @@ -127,7 +127,7 @@ if exists('b:is_posix') " ${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. + " Bash or Korn shell. We reinstate them (slightly adapted) here. syntax match shDerefOp contained \ '##\|#\|%%\|%' \ nextgroup=@shDerefPatternList @@ -150,7 +150,7 @@ if exists('b:is_bash') syntax clear bashAdminStatement " Reduce bashStatement down to just builtins; highlighting 'grep' is not - " very useful. This list was taken from `compgen -A helptopic` on Bash + " very useful. This list was taken from `compgen -A helptopic` on Bash " 4.4.5. syntax clear bashStatement syntax keyword bashStatement diff --git a/vim/after/syntax/vim.vim b/vim/after/syntax/vim.vim new file mode 100644 index 00000000..acb5cdc5 --- /dev/null +++ b/vim/after/syntax/vim.vim @@ -0,0 +1,2 @@ +" Remove special highlighting for double-quoted strings in comments +syntax clear vimCommentString diff --git a/vim/vimrc.stub.vim b/vim/vimrc.stub.vim index d0ac3bd5..b7aa1deb 100644 --- a/vim/vimrc.stub.vim +++ b/vim/vimrc.stub.vim @@ -1,5 +1,5 @@ " If we have non-tiny Vim version >=7, source real vimrc; this works because -" tiny and/or ancient builds of Vim quietly igore all code in :if blocks +" tiny and/or ancient builds of Vim quietly ignore all code in :if blocks if v:version >= 700 runtime vimrc finish |