aboutsummaryrefslogtreecommitdiff
path: root/runtime/syntax/tmux.vim
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-11-06 05:26:57 +0100
committerJustin M. Keyes <justinkz@gmail.com>2017-11-06 05:35:32 +0100
commitc348f84f218434580209a2c52552ba8fbbf1864b (patch)
tree23aa73c016b3f3941917605cd1742dfe8ca7e1fd /runtime/syntax/tmux.vim
parent93fb7383a330f03bf64ed5558a8e16ea4c742478 (diff)
downloadrneovim-c348f84f218434580209a2c52552ba8fbbf1864b.tar.gz
rneovim-c348f84f218434580209a2c52552ba8fbbf1864b.tar.bz2
rneovim-c348f84f218434580209a2c52552ba8fbbf1864b.zip
vim-patch:036986f1507d
Update runtime files. https://github.com/vim/vim/commit/036986f1507d223549d110af300144468bd3a1f7
Diffstat (limited to 'runtime/syntax/tmux.vim')
-rw-r--r--runtime/syntax/tmux.vim17
1 files changed, 7 insertions, 10 deletions
diff --git a/runtime/syntax/tmux.vim b/runtime/syntax/tmux.vim
index 4e87de8417..1ba5f67736 100644
--- a/runtime/syntax/tmux.vim
+++ b/runtime/syntax/tmux.vim
@@ -4,18 +4,16 @@
" Maintainer: Eric Pruitt <eric.pruitt@gmail.com>
" License: 2-Clause BSD (http://opensource.org/licenses/BSD-2-Clause)
-if version < 600
- syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
finish
-else
- let b:current_syntax = "tmux"
endif
-" this file uses line continuations
-let s:cpo_sav = &cpo
+" Explicitly change compatiblity options to Vim's defaults because this file
+" uses line continuations.
+let s:original_cpo = &cpo
set cpo&vim
+let b:current_syntax = "tmux"
setlocal iskeyword+=-
syntax case match
@@ -62,7 +60,6 @@ for s:i in range(0, 255)
exec "syn match tmuxColour" . s:i . " /\\<colour" . s:i . "\\>/ display"
\ " | highlight tmuxColour" . s:i . " ctermfg=" . s:i . " ctermbg=" . s:bg
endfor
-unlet s:bg s:i
syn keyword tmuxOptions
\ buffer-limit command-alias default-terminal escape-time exit-unattached
@@ -123,5 +120,5 @@ syn keyword tmuxCommands
\ swapp swap-window swapw switch-client switchc unbind-key unbind wait-for
\ wait
-let &cpo = s:cpo_sav
-unlet! s:cpo_sav
+let &cpo = s:original_cpo
+unlet! s:original_cpo s:bg s:i