The branch, master has been updated
       via  f4472c16b2b05914ed1d2eb4d5bbf9cd1929f77a (commit)
      from  fb83914bd745996429374122f2289f2930170f71 (commit)

- Log -----------------------------------------------------------------
commit f4472c16b2b05914ed1d2eb4d5bbf9cd1929f77a
Author: Tiago Cunha <tcu...@gmx.com>
Commit: Tiago Cunha <tcu...@gmx.com>

    Fix keyword matching.
    
    Per the documentation in *:syn-keyword* (in particular *E789*), the
    optional characters inside the square brackets can only be used in the
    end. Therefore, unfold some keywords which were being wrongly
    recognised.
    
    Noticed by Bruce Wolk.
---
 examples/tmux.vim |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/examples/tmux.vim b/examples/tmux.vim
index 6556e16..f1a98be 100644
--- a/examples/tmux.vim
+++ b/examples/tmux.vim
@@ -41,7 +41,7 @@ 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
+       \ clock-mode if[-shell] lock[-server] run[-shell] server-info info
        \ choose-list
 
 syn keyword tmuxOptsSet
@@ -49,11 +49,14 @@ syn keyword tmuxOptsSet
        \ 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 +78,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


-----------------------------------------------------------------------

Summary of changes:
 examples/tmux.vim |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
tmux

------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs

Reply via email to