The branch, hooks has been updated
via 8111f94ad25ddcb399946b75cc3138910bfb516a (commit)
via a15b40fb9118999d6cc90c1954a15bc0c6850f82 (commit)
from 8696611912c58a3651e772459faa4ae3cf1640b8 (commit)
- Log -----------------------------------------------------------------
commit 8111f94ad25ddcb399946b75cc3138910bfb516a
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Rename flag to CMD_Q_NOHOOKS.
---
cmd-if-shell.c | 2 +-
cmd-queue.c | 4 ++--
cmd-source-file.c | 2 +-
tmux.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cmd-if-shell.c b/cmd-if-shell.c
index fbf058f..41445a5 100644
--- a/cmd-if-shell.c
+++ b/cmd-if-shell.c
@@ -142,7 +142,7 @@ cmd_if_shell_callback(struct job *job)
cdata->started = 1;
cmdq1 = cmdq_new(cmdq->client);
- cmdq1->flags |= cmdq->flags & CMD_Q_HOOKS;
+ cmdq1->flags |= cmdq->flags & CMD_Q_NOHOOKS;
cmdq1->emptyfn = cmd_if_shell_done;
cmdq1->data = cdata;
diff --git a/cmd-queue.c b/cmd-queue.c
index 556e503..df9c872 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -174,7 +174,7 @@ cmdq_hooks_run(struct hooks *hooks, const char *prefix,
struct cmd_q *cmdq)
}
hooks_cmdq = cmdq_new(cmdq->client);
- hooks_cmdq->flags |= CMD_Q_HOOKS;
+ hooks_cmdq->flags |= CMD_Q_NOHOOKS;
hooks_cmdq->emptyfn = cmdq_hooks_emptyfn;
hooks_cmdq->data = cmdq;
@@ -237,7 +237,7 @@ cmdq_continue_one(struct cmd_q *cmdq)
if (~cmdq->flags & CMD_Q_REENTRY)
cmdq_guard(cmdq, "begin", flags);
- if (~cmdq->flags & CMD_Q_HOOKS) {
+ if (~cmdq->flags & CMD_Q_NOHOOKS) {
if (cmd_prepare_state(cmd, cmdq) != 0)
goto error;
diff --git a/cmd-source-file.c b/cmd-source-file.c
index 3c2c63c..c4002c7 100644
--- a/cmd-source-file.c
+++ b/cmd-source-file.c
@@ -46,7 +46,7 @@ cmd_source_file_exec(struct cmd *self, struct cmd_q *cmdq)
char *cause;
cmdq1 = cmdq_new(cmdq->client);
- cmdq1->flags |= cmdq->flags & CMD_Q_HOOKS;
+ cmdq1->flags |= cmdq->flags & CMD_Q_NOHOOKS;
cmdq1->emptyfn = cmd_source_file_done;
cmdq1->data = cmdq;
diff --git a/tmux.h b/tmux.h
index 0d37876..843d0eb 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1419,7 +1419,7 @@ struct cmd_q {
int flags;
#define CMD_Q_DEAD 0x1
#define CMD_Q_REENTRY 0x2
-#define CMD_Q_HOOKS 0x4
+#define CMD_Q_NOHOOKS 0x4
struct client *client;
int client_exit;
commit a15b40fb9118999d6cc90c1954a15bc0c6850f82
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Propagate hooks flag to child cmd_q.
---
cmd-if-shell.c | 1 +
cmd-source-file.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cmd-if-shell.c b/cmd-if-shell.c
index bbfc5af..fbf058f 100644
--- a/cmd-if-shell.c
+++ b/cmd-if-shell.c
@@ -142,6 +142,7 @@ cmd_if_shell_callback(struct job *job)
cdata->started = 1;
cmdq1 = cmdq_new(cmdq->client);
+ cmdq1->flags |= cmdq->flags & CMD_Q_HOOKS;
cmdq1->emptyfn = cmd_if_shell_done;
cmdq1->data = cdata;
diff --git a/cmd-source-file.c b/cmd-source-file.c
index e5710a0..3c2c63c 100644
--- a/cmd-source-file.c
+++ b/cmd-source-file.c
@@ -45,8 +45,8 @@ cmd_source_file_exec(struct cmd *self, struct cmd_q *cmdq)
struct cmd_q *cmdq1;
char *cause;
- cmdq1 = cmdq_new(NULL);
- cmdq1->client = cmdq->client;
+ cmdq1 = cmdq_new(cmdq->client);
+ cmdq1->flags |= cmdq->flags & CMD_Q_HOOKS;
cmdq1->emptyfn = cmd_source_file_done;
cmdq1->data = cmdq;
-----------------------------------------------------------------------
Summary of changes:
cmd-if-shell.c | 1 +
cmd-queue.c | 4 ++--
cmd-source-file.c | 4 ++--
tmux.h | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
