The branch, master has been updated
via ce7bf1083edd5679420d5288ae53a52759e0d51c (commit)
via 1db4ec6e6327aa4b879e42f5e37a2c599f487206 (commit)
from 1c82cf76608d7e87d734414ddba6e76622b9646c (commit)
- Log -----------------------------------------------------------------
commit ce7bf1083edd5679420d5288ae53a52759e0d51c
Merge: 1db4ec6 1c82cf7
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
FAQ | 45 ---------------------------------------------
cmd-split-window.c | 17 +++++++++++++----
names.c | 24 ++++++++++++++----------
options-table.c | 6 +++++-
tmux.1 | 7 +++++++
window.c | 18 ++++++++++++++++--
6 files changed, 55 insertions(+), 62 deletions(-)
commit 1db4ec6e6327aa4b879e42f5e37a2c599f487206
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Add pane_current_command format.
---
format.c | 3 +++
tmux.1 | 1 +
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/format.c b/format.c
index bd81799..993728c 100644
--- a/format.c
+++ b/format.c
@@ -377,6 +377,7 @@ format_window_pane(struct format_tree *ft, struct
window_pane *wp)
u_int i;
u_int idx;
const char *cwd;
+ const char *cmd;
size = 0;
for (i = 0; i < gd->hsize; i++) {
@@ -410,6 +411,8 @@ format_window_pane(struct format_tree *ft, struct
window_pane *wp)
format_add(ft, "pane_start_path", "%s", wp->cwd);
if ((cwd = osdep_get_cwd(wp->fd)) != NULL)
format_add(ft, "pane_current_path", "%s", cwd);
+ if ((cmd = osdep_get_name(wp->fd, wp->tty)) != NULL)
+ format_add(ft, "pane_current_command", "%s", cmd);
format_add(ft, "cursor_x", "%d", wp->base.cx);
format_add(ft, "cursor_y", "%d", wp->base.cy);
diff --git a/tmux.1 b/tmux.1
index 8731efb..b083825 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3020,6 +3020,7 @@ The following variables are available, where appropriate:
.It Li "mouse_standard_flag" Ta "Pane mouse standard flag"
.It Li "mouse_utf8_flag" Ta "Pane mouse UTF-8 flag"
.It Li "pane_active" Ta "1 if active pane"
+.It Li "pane_current_command" Ta "Current command if available"
.It Li "pane_current_path" Ta "Current path if available"
.It Li "pane_dead" Ta "1 if pane is dead"
.It Li "pane_height" Ta "Height of pane"
-----------------------------------------------------------------------
Summary of changes:
format.c | 3 +++
tmux.1 | 1 +
2 files changed, 4 insertions(+), 0 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
