The branch, master has been updated
via c310212d28947f35595d945936e04148a39246d8 (commit)
via 94d99d54629b182a4266d918ccf80e4daee4567b (commit)
via d325104d10b699e8c85cddd7ee9b7d2273c8cf40 (commit)
via 3aadc9d665fd3ec52181c5e1d8bd2d6481a97fef (commit)
from 9120df33efdbaac82c152ed3d5995e2be7a70411 (commit)
- Log -----------------------------------------------------------------
commit c310212d28947f35595d945936e04148a39246d8
Merge: 94d99d5 9120df3
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
CHANGES | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 1 +
cmd-load-buffer.c | 1 +
cmd-set-option.c | 6 +++-
configure.ac | 2 +-
paste.c | 4 ++-
server-client.c | 4 +-
window-copy.c | 4 +-
8 files changed, 69 insertions(+), 8 deletions(-)
commit 94d99d54629b182a4266d918ccf80e4daee4567b
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Put each command on its own line and remove duplicates, from Daniel Hahler.
---
examples/tmux.vim | 276 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 227 insertions(+), 49 deletions(-)
diff --git a/examples/tmux.vim b/examples/tmux.vim
index 037ddf7..4d64514 100644
--- a/examples/tmux.vim
+++ b/examples/tmux.vim
@@ -31,59 +31,237 @@ syn keyword tmuxAction any current none
syn keyword tmuxBoolean off on
syn keyword tmuxCmds
- \ attach[-session] bind[-key] break-pane breakp capture-pane capturep
- \ choose-buffer choose-client choose-list choose-session choose-tree
- \ choose-window clear-history clearhist clock-mode command-prompt
- \ confirm[-before] copy-mode delete-buffer deleteb detach[-client]
- \ display[-message] display-panes displayp find-window findw
- \ has[-session] if[-shell] join-pane joinp kill-pane killp kill-server
- \ kill-session kill-window killw last-pane lastp last[-window]
- \ link-window linkw list-buffers lsb list-clients lsc
- \ list-commands lscm list-keys lsk list-panes lsp list-sessions ls
- \ list-windows lsw load-buffer loadb lock-client lockc lock[-server]
- \ lock-session locks move-pane movep move-window movew new[-session]
- \ next-layout nextl next[-window] paste-buffer pasteb pipe-pane pipep
- \ previous-layout prevl prev[ious-window] refresh[-client]
- \ rename[-session] rename-window renamew resize-pane resizep
- \ respawn-pane respawnp respawn-window respawnw rotate-window rotatew
- \ run[-shell] save-buffer saveb select-layout selectl
- \ select-pane selectp select-window selectw send[-keys] send-prefix
- \ server-info info set-buffer setb set-environment setenv set[-option]
- \ set-window-option setw show-buffer showb show-environment showenv
- \ show-messages showmsgs show[-options] show-window-options showw
- \ source[-file] split-window splitw start[-server]
- \ suspend-client suspendc swap-pane swapp swap-window swapw
- \ switch-client switchc unbind[-key] unlink-window unlinkw wait[-for]
+ \ attach[-session]
+ \ bind[-key]
+ \ break-pane
+ \ breakp
+ \ capture-pane
+ \ capturep
+ \ choose-buffer
+ \ choose-client
+ \ choose-list
+ \ choose-session
+ \ choose-tree
+ \ choose-window
+ \ clear-history
+ \ clearhist
+ \ clock-mode
+ \ command-prompt
+ \ confirm[-before]
+ \ copy-mode
+ \ delete-buffer
+ \ deleteb
+ \ detach[-client]
+ \ display[-message]
+ \ display-panes
+ \ displayp
+ \ find-window
+ \ findw
+ \ has[-session]
+ \ if[-shell]
+ \ join-pane
+ \ joinp
+ \ kill-pane
+ \ killp
+ \ kill-server
+ \ kill-session
+ \ kill-window
+ \ killw
+ \ last-pane
+ \ lastp
+ \ last[-window]
+ \ link-window
+ \ linkw
+ \ list-buffers
+ \ lsb
+ \ list-clients
+ \ lsc
+ \ list-commands
+ \ lscm
+ \ list-keys
+ \ lsk
+ \ list-panes
+ \ lsp
+ \ list-sessions
+ \ ls
+ \ list-windows
+ \ lsw
+ \ load-buffer
+ \ loadb
+ \ lock-client
+ \ lockc
+ \ lock[-server]
+ \ lock-session
+ \ locks
+ \ move-pane
+ \ movep
+ \ move-window
+ \ movew
+ \ new[-session]
+ \ next-layout
+ \ nextl
+ \ next[-window]
+ \ paste-buffer
+ \ pasteb
+ \ pipe-pane
+ \ pipep
+ \ previous-layout
+ \ prevl
+ \ prev[ious-window]
+ \ refresh[-client]
+ \ rename[-session]
+ \ rename-window
+ \ renamew
+ \ resize-pane
+ \ resizep
+ \ respawn-pane
+ \ respawnp
+ \ respawn-window
+ \ respawnw
+ \ rotate-window
+ \ rotatew
+ \ run[-shell]
+ \ save-buffer
+ \ saveb
+ \ select-layout
+ \ selectl
+ \ select-pane
+ \ selectp
+ \ select-window
+ \ selectw
+ \ send[-keys]
+ \ send-prefix
+ \ server-info
+ \ info
+ \ set-buffer
+ \ setb
+ \ set-environment
+ \ setenv
+ \ set[-option]
+ \ set-window-option
+ \ setw
+ \ show-buffer
+ \ showb
+ \ show-environment
+ \ showenv
+ \ show-messages
+ \ showmsgs
+ \ show[-options]
+ \ show-window-options
+ \ showw
+ \ source[-file]
+ \ split-window
+ \ splitw
+ \ start[-server]
+ \ suspend-client
+ \ suspendc
+ \ swap-pane
+ \ swapp
+ \ swap-window
+ \ swapw
+ \ switch-client
+ \ switchc
+ \ unbind[-key]
+ \ unlink-window
+ \ unlinkw
+ \ wait[-for]
syn keyword tmuxOptsSet
- \ buffer-limit escape-time exit-unattached exit-unattached focus-events
- \ quiet set-clipboard
- \ assume-paste-time base-index bell-action bell-on-alert default-command
- \ default-shell default-terminal destroy-unattached detach-on-destroy
- \ display-panes-active-colour display-panes-colour display-panes-time
- \ display-time history-limit lock-after-time lock-command lock-server
- \ message-command-style message-limit message-style mouse-resize-pane
- \ mouse-select-pane mouse-select-window mouse-utf8
- \ pane-active-border-style pane-border-style prefix prefix2
- \ renumber-windows repeat-time set-remain-on-exit set-titles
- \ set-titles-string status status-interval status-justify status-keys
- \ status-left status-left-length status-left-style status-position
- \ status-right status-right-length staus-right-style status-utf8
- \ terminal-overrides update-environment visual-activity visual-bell
- \ visual-content visual-silence word-separators
+ \ assume-paste-time
+ \ base-index
+ \ bell-action
+ \ bell-on-alert
+ \ buffer-limit
+ \ default-command
+ \ default-shell
+ \ default-terminal
+ \ destroy-unattached
+ \ detach-on-destroy
+ \ display-panes-active-colour
+ \ display-panes-colour
+ \ display-panes-time
+ \ display-time
+ \ escape-time
+ \ exit-unattached
+ \ focus-events
+ \ history-limit
+ \ lock-after-time
+ \ lock-command
+ \ lock-server
+ \ message-command-style
+ \ message-limit
+ \ message-style
+ \ mouse-resize-pane
+ \ mouse-select-pane
+ \ mouse-select-window
+ \ mouse-utf8
+ \ pane-active-border-style
+ \ pane-border-style
+ \ prefix
+ \ prefix2
+ \ quiet
+ \ renumber-windows
+ \ repeat-time
+ \ set-clipboard
+ \ set-remain-on-exit
+ \ set-titles
+ \ set-titles-string
+ \ status
+ \ status-interval
+ \ status-justify
+ \ status-keys
+ \ status-left
+ \ status-left-length
+ \ status-left-style
+ \ status-position
+ \ status-right
+ \ status-right-length
+ \ status-utf8
+ \ staus-right-style
+ \ terminal-overrides
+ \ update-environment
+ \ visual-activity
+ \ visual-bell
+ \ visual-content
+ \ visual-silence
+ \ word-separators
syn keyword tmuxOptsSetw
- \ aggressive-resize allow-rename alternate-screen automatic-rename
- \ c0-change-interval c0-change-trigger clock-mode-colour
- \ clock-mode-style force-height force-width force-height
- \ force-width main-pane-height main-pane-width mode-keys
- \ mode-mouse mode-style monitor-activity monitor-content monitor-silence
- \ other-pane-height other-pane-width pane-base-index remain-on-exit
- \ synchronize-panes utf8 window-status-activity-style
- \ window-status-bell-style window-status-content-style
- \ window-status-current-format window-status-current-style
- \ window-status-format window-status-last-style window-status-separator
- \ window-status-style wrap-search xterm-keys
+ \ aggressive-resize
+ \ allow-rename
+ \ alternate-screen
+ \ automatic-rename
+ \ c0-change-interval
+ \ c0-change-trigger
+ \ clock-mode-colour
+ \ clock-mode-style
+ \ force-height
+ \ force-width
+ \ main-pane-height
+ \ main-pane-width
+ \ mode-keys
+ \ mode-mouse
+ \ mode-style
+ \ monitor-activity
+ \ monitor-content
+ \ monitor-silence
+ \ other-pane-height
+ \ other-pane-width
+ \ pane-base-index
+ \ remain-on-exit
+ \ synchronize-panes
+ \ utf8
+ \ window-status-activity-style
+ \ window-status-bell-style
+ \ window-status-content-style
+ \ window-status-current-format
+ \ window-status-current-style
+ \ window-status-format
+ \ window-status-last-style
+ \ window-status-separator
+ \ window-status-style
+ \ wrap-search
+ \ xterm-keys
syn keyword tmuxTodo FIXME NOTE TODO XXX contained
commit d325104d10b699e8c85cddd7ee9b7d2273c8cf40
Merge: 3aadc9d b3de4a3
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
cmd-load-buffer.c | 2 +-
cmd-set-option.c | 2 +-
cmd-show-messages.c | 28 ++++++++++++++--------------
cmd-switch-client.c | 2 +-
grid.c | 2 +-
mode-key.c | 6 ++++++
server-client.c | 12 ++++++------
server-fn.c | 6 +++---
server-window.c | 19 +++++++------------
status.c | 20 ++++++++++++--------
tmux.1 | 8 ++++----
tty-keys.c | 18 +++++++++---------
tty.c | 28 ++++++++++++++++++++++------
xterm-keys.c | 4 +++-
14 files changed, 90 insertions(+), 67 deletions(-)
commit 3aadc9d665fd3ec52181c5e1d8bd2d6481a97fef
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Missing *.
---
TODO | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/TODO b/TODO
index b9a83fb..6c41894 100644
--- a/TODO
+++ b/TODO
@@ -119,7 +119,7 @@
- miscellaneous
* way to keep a job running just read its last line of output for #()
- link panes into multiple windows
+ * link panes into multiple windows
* live update: server started with -U connects to server, requests
sessions and windows, receives file descriptors
* there are inconsistencies in what we get from old shell and what
-----------------------------------------------------------------------
Summary of changes:
TODO | 2 +-
examples/tmux.vim | 276 +++++++++++++++++++++++++++++++++++++++++++----------
2 files changed, 228 insertions(+), 50 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121054471&iu=/4140/ostg.clktrk
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
