Move the single command flag (CMD_CONTROL) into the shared flags.

3 files changed, 4 insertions, 7 deletions

diff --git a/cmd-queue.c b/cmd-queue.c
index fb2c7fac..93b9788e 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -266,13 +266,14 @@ static enum cmd_retval
 cmdq_fire_command(struct cmdq_item *item)
 {
 	struct client		*c = item->client;
+	struct cmdq_shared	*shared = item->shared;
 	struct cmd		*cmd = item->cmd;
 	const struct cmd_entry	*entry = cmd->entry;
 	enum cmd_retval		 retval;
 	struct cmd_find_state	*fsp, fs;
 	int			 flags;
 
-	flags = !!(cmd->flags & CMD_CONTROL);
+	flags = !!(shared->flags & CMDQ_SHARED_CONTROL);
 	cmdq_guard(item, "begin", flags);
 
 	if (item->client == NULL)
diff --git a/control.c b/control.c
index 64e9fec1..41c50df7 100644
--- a/control.c
+++ b/control.c
@@ -70,7 +70,6 @@ control_callback(struct client *c, int closed, __unused void *data)
 {
 	char			*line, *cause;
 	struct cmd_list		*cmdlist;
-	struct cmd		*cmd;
 	struct cmdq_item	*item;
 
 	if (closed)
@@ -90,9 +89,8 @@ control_callback(struct client *c, int closed, __unused void *data)
 			item = cmdq_get_callback(control_error, cause);
 			cmdq_append(c, item);
 		} else {
-			TAILQ_FOREACH(cmd, &cmdlist->list, qentry)
-				cmd->flags |= CMD_CONTROL;
 			item = cmdq_get_command(cmdlist, NULL, NULL, 0);
+			item->shared->flags |= CMDQ_SHARED_CONTROL;
 			cmdq_append(c, item);
 			cmd_list_free(cmdlist);
 		}
diff --git a/tmux.h b/tmux.h
index afecd5b6..4317bf0b 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1285,9 +1285,6 @@ struct cmd {
 	char			*file;
 	u_int			 line;
 
-#define CMD_CONTROL 0x1
-	int			 flags;
-
 	TAILQ_ENTRY(cmd)	 qentry;
 };
 
@@ -1316,6 +1313,7 @@ struct cmdq_shared {
 
 	int			 flags;
 #define CMDQ_SHARED_REPEAT 0x1
+#define CMDQ_SHARED_CONTROL 0x2
 
 	struct format_tree	*formats;