The branch, master has been updated
via 7be152412ea0a614df11bce9ba5097574369a5f6 (commit)
via d0fa48db1eaea5fc2fa62111c2bfb4836f2b5f03 (commit)
via 884a21d0f5b5b5b1d19a84b3e2f40a42a0b6105c (commit)
from 21bca549d35b3d0b4ff1f22f66e5e108c103ac4b (commit)
- Log -----------------------------------------------------------------
commit 7be152412ea0a614df11bce9ba5097574369a5f6
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Make cmdq->client_exit a tristate (-1 means "not set") so that if explicitly
set it can be copied from child to parent cmdq by if-shell and
source-file. This fixes using attach or new. From Chris Johnsen.
---
cmd-if-shell.c | 3 +++
cmd-queue.c | 4 ++--
cmd-source-file.c | 3 +++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/cmd-if-shell.c b/cmd-if-shell.c
index a074341..9b6dcf3 100644
--- a/cmd-if-shell.c
+++ b/cmd-if-shell.c
@@ -147,6 +147,9 @@ cmd_if_shell_done(struct cmd_q *cmdq1)
struct cmd_if_shell_data *cdata = cmdq1->data;
struct cmd_q *cmdq = cdata->cmdq;
+ if (cmdq1->client_exit >= 0)
+ cmdq->client_exit = cmdq1->client_exit;
+
if (!cmdq_free(cmdq) && !cdata->bflag)
cmdq_continue(cmdq);
diff --git a/cmd-queue.c b/cmd-queue.c
index 38a88d2..19d9819 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -35,7 +35,7 @@ cmdq_new(struct client *c)
cmdq->dead = 0;
cmdq->client = c;
- cmdq->client_exit = 0;
+ cmdq->client_exit = -1;
TAILQ_INIT(&cmdq->queue);
cmdq->item = NULL;
@@ -259,7 +259,7 @@ cmdq_continue(struct cmd_q *cmdq)
} while (cmdq->item != NULL);
empty:
- if (cmdq->client_exit)
+ if (cmdq->client_exit > 0)
cmdq->client->flags |= CLIENT_EXIT;
if (cmdq->emptyfn != NULL)
cmdq->emptyfn(cmdq); /* may free cmdq */
diff --git a/cmd-source-file.c b/cmd-source-file.c
index d636643..eb7e149 100644
--- a/cmd-source-file.c
+++ b/cmd-source-file.c
@@ -95,6 +95,9 @@ cmd_source_file_done(struct cmd_q *cmdq1)
{
struct cmd_q *cmdq = cmdq1->data;
+ if (cmdq1->client_exit >= 0)
+ cmdq->client_exit = cmdq1->client_exit;
+
cmdq_free(cmdq1);
cfg_references--;
commit d0fa48db1eaea5fc2fa62111c2bfb4836f2b5f03
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Restore missing key binding for %, from Chris Johnsen.
---
cmd-split-window.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cmd-split-window.c b/cmd-split-window.c
index 5b5140b..40f7966 100644
--- a/cmd-split-window.c
+++ b/cmd-split-window.c
@@ -36,7 +36,7 @@ const struct cmd_entry cmd_split_window_entry = {
"[-dhvP] [-c start-directory] [-F format] [-p percentage|-l size] "
CMD_TARGET_PANE_USAGE " [command]",
0,
- NULL,
+ cmd_split_window_key_binding,
cmd_split_window_exec
};
commit 884a21d0f5b5b5b1d19a84b3e2f40a42a0b6105c
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
First period not last for host_short, from Michael Scholz.
---
format.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/format.c b/format.c
index da939f0..ba4b95b 100644
--- a/format.c
+++ b/format.c
@@ -121,7 +121,7 @@ format_create(void)
if (gethostname(host, sizeof host) == 0) {
format_add(ft, "host", "%s", host);
- if ((ptr = strrchr(host, '.')) != NULL)
+ if ((ptr = strchr(host, '.')) != NULL)
*ptr = '\0';
format_add(ft, "host_short", "%s", host);
}
-----------------------------------------------------------------------
Summary of changes:
cmd-if-shell.c | 3 +++
cmd-queue.c | 4 ++--
cmd-source-file.c | 3 +++
cmd-split-window.c | 2 +-
format.c | 2 +-
5 files changed, 10 insertions(+), 4 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
