The branch, hooks has been updated
via 176e90bc0a6e25f2263b01b4c26c2631d0409eaf (commit)
from 24f81102d5f3106aa01c09c5d826de3b4a78944f (commit)
- Log -----------------------------------------------------------------
commit 176e90bc0a6e25f2263b01b4c26c2631d0409eaf
Author: Thomas Adam <[email protected]>
Commit: Thomas Adam <[email protected]>
Rename current -> default state
---
cmd-queue.c | 19 ++++++++++---------
tmux.h | 2 +-
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/cmd-queue.c b/cmd-queue.c
index 1df40fc..f16a339 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -33,16 +33,17 @@ void cmdq_run_hook(struct hooks *, const char *,
struct cmd *,
void
cmdq_set_state(struct cmd_q *cmdq)
{
- memset(&cmdq->current_state, 0, sizeof cmdq->current_state);
+ memset(&cmdq->default_state, 0, sizeof cmdq->default_state);
- cmdq->current_state.c = cmdq->client;
+ cmdq->default_state.c = cmdq->client;
- cmdq->current_state.s = cmdq->client != NULL ? cmdq->client->session :
NULL;
- cmdq->current_state.s2 = NULL;
+ cmdq->default_state.s = cmdq->client != NULL ?
+ cmdq->client->session : NULL;
+ cmdq->default_state.s2 = NULL;
- cmdq->current_state.w = NULL;
- cmdq->current_state.wl = NULL;
- cmdq->current_state.wp = NULL;
+ cmdq->default_state.w = NULL;
+ cmdq->default_state.wl = NULL;
+ cmdq->default_state.wp = NULL;
}
/* Create new command queue. */
@@ -232,8 +233,8 @@ cmdq_continue(struct cmd_q *cmdq)
* otherwise used the intended session's hooks when
* running the command.
*/
- if (cmdq->current_state.s != NULL)
- hooks = &cmdq->current_state.s->hooks;
+ if (cmdq->default_state.s != NULL)
+ hooks = &cmdq->default_state.s->hooks;
else
hooks = &global_hooks;
diff --git a/tmux.h b/tmux.h
index 46e301a..83bbfae 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1422,8 +1422,8 @@ struct cmd_q {
struct cmd_q_items queue;
struct cmd_q_item *item;
struct cmd *cmd;
- struct cmd_state default_state;
struct cmd_state current_state;
+ struct cmd_state default_state;
time_t time;
u_int number;
-----------------------------------------------------------------------
Summary of changes:
cmd-queue.c | 19 ++++++++++---------
tmux.h | 2 +-
2 files changed, 11 insertions(+), 10 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
