mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-10-26 12:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2019-05-18 23:02:36 +01:00
parent 831c67c2d8 82ebd98c5f
commit 54da493476
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd-queue.c
View File

@@ -266,13 +266,14 @@ static enum cmd_retval
cmdq_fire_command(struct cmdq_item *item) cmdq_fire_command(struct cmdq_item *item)
{ {
struct client *c = item->client; struct client *c = item->client;
struct cmdq_shared *shared = item->shared;
struct cmd *cmd = item->cmd; struct cmd *cmd = item->cmd;
const struct cmd_entry *entry = cmd->entry; const struct cmd_entry *entry = cmd->entry;
enum cmd_retval retval; enum cmd_retval retval;
struct cmd_find_state *fsp, fs; struct cmd_find_state *fsp, fs;
int flags; int flags;
flags = !!(cmd->flags & CMD_CONTROL); flags = !!(shared->flags & CMDQ_SHARED_CONTROL);
cmdq_guard(item, "begin", flags); cmdq_guard(item, "begin", flags);
if (item->client == NULL) if (item->client == NULL)

4
control.c
View File

@@ -70,7 +70,6 @@ control_callback(struct client *c, int closed, __unused void *data)
{ {
char *line, *cause; char *line, *cause;
struct cmd_list *cmdlist; struct cmd_list *cmdlist;
struct cmd *cmd;
struct cmdq_item *item; struct cmdq_item *item;
if (closed) if (closed)
@@ -90,9 +89,8 @@ control_callback(struct client *c, int closed, __unused void *data)
item = cmdq_get_callback(control_error, cause); item = cmdq_get_callback(control_error, cause);
cmdq_append(c, item); cmdq_append(c, item);
} else { } else {
TAILQ_FOREACH(cmd, &cmdlist->list, qentry)
cmd->flags |= CMD_CONTROL;
item = cmdq_get_command(cmdlist, NULL, NULL, 0); item = cmdq_get_command(cmdlist, NULL, NULL, 0);
item->shared->flags |= CMDQ_SHARED_CONTROL;
cmdq_append(c, item); cmdq_append(c, item);
cmd_list_free(cmdlist); cmd_list_free(cmdlist);
} }

4
tmux.h
View File

@@ -1287,9 +1287,6 @@ struct cmd {
char *file; char *file;
u_int line; u_int line;
#define CMD_CONTROL 0x1
int flags;
TAILQ_ENTRY(cmd) qentry; TAILQ_ENTRY(cmd) qentry;
}; };
@@ -1318,6 +1315,7 @@ struct cmdq_shared {
int flags; int flags;
#define CMDQ_SHARED_REPEAT 0x1 #define CMDQ_SHARED_REPEAT 0x1
#define CMDQ_SHARED_CONTROL 0x2
struct format_tree *formats; struct format_tree *formats;