diff options
author | Jesse Luehrs <doy@tozt.net> | 2013-10-27 23:54:08 -0400 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2013-10-27 23:57:33 -0400 |
commit | 647e000e0d5021d7684ade725599ad78634f8ad4 (patch) | |
tree | 7d24ca7137e517e501a590e055bc1e51cd2ad663 /vim | |
parent | dad82f6d1eaf565300fc6833f6da43b2f1097801 (diff) | |
download | conf-647e000e0d5021d7684ade725599ad78634f8ad4.tar.gz conf-647e000e0d5021d7684ade725599ad78634f8ad4.zip |
update some things from their external sources
Diffstat (limited to 'vim')
-rw-r--r-- | vim/syntax/nhdes.vim | 45 | ||||
-rw-r--r-- | vim/syntax/tmux.vim | 34 |
2 files changed, 55 insertions, 24 deletions
diff --git a/vim/syntax/nhdes.vim b/vim/syntax/nhdes.vim index f2eefd3..dcafdf3 100644 --- a/vim/syntax/nhdes.vim +++ b/vim/syntax/nhdes.vim @@ -14,6 +14,9 @@ syn sync minlines=30 " we're case sensitive syn case match +" some keywords use '-' +setlocal iskeyword+=- + syn region nhDesComment start=/^[ \t]*#/ end=/$/ syn keyword nhDesCommandNoArgs @@ -40,6 +43,9 @@ syn keyword nhDesConstant syn region nhDesString start=/"/ end=/"/ syn match nhDesChar /'.'/ +syn match nhDesCoord /(\s*\d\+\s*,\s*\d\+\s*)/ +syn match nhDesRegion /(\s*\d\+\s*,\s*\d\+\s*,\s*\d\+\s*,\s*\d\+\s*)/ + syn match nhDesMapCharDoor /[+S]/ contained syn match nhDesMapCharFloor /[\.B]/ contained syn match nhDesMapCharCorridor /[#H]/ contained @@ -57,7 +63,12 @@ syn match nhDesMapCharLinenum /[0123456789]/ contained " TODO: Any better way to do this? syn match nhDesMapCharError /[^+S\.B#H\-\| WP}{\\ACLKITF0-9]/ contained -syn region nhDesMap matchgroup=nhDesCommandNoArgs start=/^MAP$/ end=/^ENDMAP$/ contains=nhDesMapCharError,nhDesMapCharDoor,nhDesMapCharFloor,nhDesMapCharCorridor,nhDesMapCharWall,nhDesMapCharWater,nhDesMapCharThrone,nhDesMapCharAir,nhDesMapCharCloud,nhDesMapCharLava,nhDesMapCharSink,nhDesMapCharIce,nhDesMapCharTree,nhDesMapCharIronbars,nhDesMapCharLinenum +syn region nhDesMap matchgroup=nhDesCommandNoArgs start=/^MAP$/ end=/^ENDMAP$/ + \ contains=nhDesMapCharError,nhDesMapCharDoor,nhDesMapCharFloor, + \ nhDesMapCharCorridor,nhDesMapCharWall,nhDesMapCharWater, + \ nhDesMapCharThrone,nhDesMapCharAir,nhDesMapCharCloud,nhDesMapCharLava, + \ nhDesMapCharSink,nhDesMapCharIce,nhDesMapCharTree,nhDesMapCharIronbars, + \ nhDesMapCharLinenum hi def link nhDesComment Comment hi def link nhDesCommandNoArgs KeyWord @@ -66,21 +77,23 @@ hi def link nhDesRegister Constant hi def link nhDesConstant Constant hi def link nhDesString String hi def link nhDesChar String +hi def link nhDesCoord Number +hi def link nhDesRegion Number -highlight nhDesMapCharDoor ctermbg=black ctermfg=brown -highlight nhDesMapCharFloor ctermbg=black ctermfg=grey -highlight nhDesMapCharCorridor ctermbg=black ctermfg=grey -highlight nhDesMapCharWall ctermbg=black ctermfg=grey -highlight nhDesMapCharWater ctermbg=black ctermfg=darkblue -highlight nhDesMapCharThrone ctermbg=black ctermfg=yellow -highlight nhDesMapCharAir ctermbg=black ctermfg=lightblue -highlight nhDesMapCharCloud ctermbg=black ctermfg=grey -highlight nhDesMapCharLava ctermbg=black ctermfg=red -highlight nhDesMapCharSink ctermbg=black ctermfg=grey -highlight nhDesMapCharIce ctermbg=black ctermfg=lightblue -highlight nhDesMapCharTree ctermbg=black ctermfg=green -highlight nhDesMapCharIronbars ctermbg=black ctermfg=cyan -highlight nhDesMapCharLinenum ctermbg=black ctermfg=darkgrey -highlight nhDesMapCharError ctermbg=red ctermfg=yellow +highlight nhDesMapCharDoor ctermbg=black ctermfg=brown guibg=black guifg=brown +highlight nhDesMapCharFloor ctermbg=black ctermfg=grey guibg=black guifg=grey +highlight nhDesMapCharCorridor ctermbg=black ctermfg=grey guibg=black guifg=grey +highlight nhDesMapCharWall ctermbg=black ctermfg=grey guibg=black guifg=grey +highlight nhDesMapCharWater ctermbg=black ctermfg=darkblue guibg=black guifg=darkblue +highlight nhDesMapCharThrone ctermbg=black ctermfg=yellow guibg=black guifg=yellow +highlight nhDesMapCharAir ctermbg=black ctermfg=lightblue guibg=black guifg=lightblue +highlight nhDesMapCharCloud ctermbg=black ctermfg=grey guibg=black guifg=grey +highlight nhDesMapCharLava ctermbg=black ctermfg=red guibg=black guifg=red +highlight nhDesMapCharSink ctermbg=black ctermfg=grey guibg=black guifg=grey +highlight nhDesMapCharIce ctermbg=black ctermfg=lightblue guibg=black guifg=lightblue +highlight nhDesMapCharTree ctermbg=black ctermfg=green guibg=black guifg=green +highlight nhDesMapCharIronbars ctermbg=black ctermfg=cyan guibg=black guifg=cyan +highlight nhDesMapCharLinenum ctermbg=black ctermfg=darkgrey guibg=black guifg=darkgrey +highlight nhDesMapCharError ctermbg=red ctermfg=yellow guibg=red guifg=yellow let b:current_syntax = "nhdes" diff --git a/vim/syntax/tmux.vim b/vim/syntax/tmux.vim index 6556e16..e85f8ff 100644 --- a/vim/syntax/tmux.vim +++ b/vim/syntax/tmux.vim @@ -3,6 +3,20 @@ " Maintainer: Tiago Cunha <tcunha@users.sourceforge.net> " Last Change: $Date: 2010-07-27 18:29:07 $ " License: This file is placed in the public domain. +" +" To install this file: +" +" - Drop the file in the syntax directory into runtimepath (such as +" ~/.vim/syntax/tmux.vim). +" - Make the filetype recognisable by adding the following to filetype.vim +" (~/.vim/filetype.vim): +" +" augroup filetypedetect +" au BufNewFile,BufRead .tmux.conf*,tmux.conf* setf tmux +" augroup END +" +" - Switch on syntax highlighting by adding "syntax enable" to .vimrc. +" if version < 600 syntax clear @@ -41,19 +55,22 @@ syn keyword tmuxCmds \ choose-buffer clearhist clear-history deleteb delete-buffer lsb \ list-buffers loadb load-buffer pasteb paste-buffer saveb save-buffer \ setb set-buffer showb show-buffer - \ clock-mode if[-shell] lock[-server] run[-shell] [server-]info - \ choose-list + \ clock-mode if[-shell] lock[-server] run[-shell] server-info info + \ choose-list wait-for syn keyword tmuxOptsSet \ buffer-limit escape-time exit-unattached exit-unattached quiet \ set-clipboard \ base-index bell-action bell-on-alert default-command default-path \ default-shell default-terminal destroy-unattached detach-on-destroy - \ display-panes-[active-]colour display-[panes-]time history-limit - \ lock-after-time lock-command lock-server message-[command-]attr - \ message-[command-]bg message-[command-]fg message-limit + \ display-panes-active-colour display-panes-colour display-panes-time + \ display-time history-limit + \ lock-after-time lock-command lock-server + \ message-command-attr message-attr message-command-bg message-bg + \ message-command-fg message-fg message-limit \ mouse-resize-pane mouse-select-pane mouse-select-window mouse-utf8 - \ pane-[active-]border-bg pane-[active-]border-fg prefix prefix2 + \ pane-active-border-bg pane-border-bg pane-active-border-fg + \ pane-border-fg prefix prefix2 \ renumber-windows repeat-time set-remain-on-exit set-titles \ set-titles-string status status-attr status-bg status-fg \ status-interval status-justify status-keys status-left @@ -75,8 +92,9 @@ syn keyword tmuxOptsSetw \ window-status-content-bg window-status-content-fg \ window-status-activity-attr window-status-activity-bg \ window-status-activity-fg window-status-attr - \ window-status-[current-]attr window-status-[current-]bg - \ window-status-[current-]fg window-status-[current-]format + \ window-status-current-attr window-status-attr window-status-current-bg + \ window-status-bg window-status-current-fg window-status-fg + \ window-status-current-format window-status-format \ window-status-separator xterm-keys wrap-search syn keyword tmuxTodo FIXME NOTE TODO XXX contained |