diff options
| -rwxr-xr-x | build | 5 | ||||
| -rw-r--r-- | indent/html.vim | 5 | ||||
| -rw-r--r-- | syntax/log.vim | 6 | ||||
| -rw-r--r-- | syntax/ruby.vim | 2 | ||||
| -rw-r--r-- | syntax/tmux.vim | 8 |
5 files changed, 14 insertions, 12 deletions
@@ -780,7 +780,10 @@ def download end $i = 0 -LYRICS = "Never gonna give you up. Never gonna let you down. Never gonna run around and desert you. Never gonna make you cry. Never gonna say goodbye. Never gonna tell a lie and hurt you....." +LYRICS = "Never gonna give you up. Never gonna let you down. " + + "Never gonna run around and desert you. " + + "Never gonna make you cry. Never gonna say goodbye. " + + "Never gonna tell a lie and hurt you." $mutex = Mutex.new def progress diff --git a/indent/html.vim b/indent/html.vim index 89869f4a..3b9c7eb4 100644 --- a/indent/html.vim +++ b/indent/html.vim @@ -843,12 +843,11 @@ func! HtmlIndent_FindTagStart(lnum) " - a flag indicating whether we found the end of a tag. " This method is global so that HTML-like indenters can use it. " To avoid matching " > " or " < " inside a string require that the opening - " "<" is followed by a word character and the closing ">" comes after a - " non-white character. + " "<" is followed by a word character let idx = match(getline(a:lnum), '\S>\s*$') if idx > 0 call cursor(a:lnum, idx) - let lnum = searchpair('<\w', '' , '\S>', 'bW', '', max([a:lnum - b:html_indent_line_limit, 0])) + let lnum = searchpair('<\w', '' , '>', 'bW', '', max([a:lnum - b:html_indent_line_limit, 0])) if lnum > 0 return [lnum, 1] endif diff --git a/syntax/log.vim b/syntax/log.vim index 40abeb34..1fe7051e 100644 --- a/syntax/log.vim +++ b/syntax/log.vim @@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'log') == -1 " Vim syntax file " Language: Generic log file " Maintainer: MTDL9 <https://github.com/MTDL9> -" Latest Revision: 2019-11-24 +" Latest Revision: 2020-08-23 if exists('b:current_syntax') finish @@ -15,7 +15,7 @@ set cpoptions&vim " Operators "--------------------------------------------------------------------------- -syn match logOperator display '[;,\?\:\.\<=\>\~\/\@\&\!$\%\&\+\-\|\^(){}\*#]' +syn match logOperator display '[;,\?\:\.\<=\>\~\/\@\!$\%&\+\-\|\^(){}\*#]' syn match logBrackets display '[\[\]]' syn match logEmptyLines display '-\{3,}' syn match logEmptyLines display '\*\{3,}' @@ -87,7 +87,7 @@ syn match logXmlAttribute contained "\(\n\|\s\)\(\(\w\|-\)\+:\)\?\(\w\|-\)\+\ syn match logXmlNamespace contained "\(\w\|-\)\+:" contains=logOperator syn region logXmlComment start=/<!--/ end=/-->/ syn match logXmlCData /<!\[CDATA\[.*\]\]>/ -syn match logXmlEntity /\&\w\+;/ +syn match logXmlEntity /&#\?\w\+;/ " Levels diff --git a/syntax/ruby.vim b/syntax/ruby.vim index 0a38ad8e..ec10fbbb 100644 --- a/syntax/ruby.vim +++ b/syntax/ruby.vim @@ -67,7 +67,7 @@ endfunction com! -nargs=* SynFold call s:run_syntax_fold(<q-args>) " Not-Top Cluster {{{1 -syn cluster rubyNotTop contains=@rubyCommentNotTop,@rubyStringNotTop,@rubyRegexpSpecial,@rubyDeclaration,@rubyExceptionHandler,@rubyClassOperator,rubyConditional,rubyModuleName,rubyClassName,rubySymbolDelimiter,rubyParentheses +syn cluster rubyNotTop contains=@rubyCommentNotTop,@rubyStringNotTop,@rubyRegexpSpecial,@rubyDeclaration,@rubyExceptionHandler,@rubyClassOperator,rubyConditional,rubyModuleName,rubyClassName,rubySymbolDelimiter,rubyParentheses,@Spell " Whitespace Errors {{{1 if exists("ruby_space_errors") diff --git a/syntax/tmux.vim b/syntax/tmux.vim index 7993d481..d1cf1301 100644 --- a/syntax/tmux.vim +++ b/syntax/tmux.vim @@ -1,7 +1,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tmux') == -1 " Language: tmux(1) configuration file -" Version: before-OpenBSD-lock (git-53c84fd4) +" Version: 3.1b (git-769ae106) " URL: https://github.com/ericpruitt/tmux.vim/ " Maintainer: Eric Pruitt <eric.pruitt@gmail.com> " License: 2-Clause BSD (http://opensource.org/licenses/BSD-2-Clause) @@ -32,10 +32,10 @@ syn match tmuxVariable /\w\+=/ display syn match tmuxVariableExpansion /\${\=\w\+}\=/ display syn match tmuxControl /%\(if\|elif\|else\|endif\)/ -syn region tmuxComment start=/#/ skip=/\\\@<!\\$/ end=/$/ contains=tmuxTodo +syn region tmuxComment start=/#/ skip=/\\\@<!\\$/ end=/$/ contains=tmuxTodo,@Spell -syn region tmuxString start=+"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=tmuxFormatString -syn region tmuxString start=+'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end='$' contains=tmuxFormatString +syn region tmuxString start=+"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=tmuxFormatString,@Spell +syn region tmuxString start=+'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end='$' contains=tmuxFormatString,@Spell " TODO: Figure out how escaping works inside of #(...) and #{...} blocks. syn region tmuxFormatString start=/#[#DFhHIPSTW]/ end=// contained keepend |