circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 09:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2019-09-11 16:48:58 +01:00
parent 2e90841f2e 0feae4d8ae
commit 658ecb0777
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd-parse.y
View File

@@ -176,18 +176,18 @@ expanded : format
struct cmd_parse_input *pi = ps->input; struct cmd_parse_input *pi = ps->input;
struct format_tree *ft; struct format_tree *ft;
struct client *c = pi->c; struct client *c = pi->c;
struct cmd_find_state *fs; struct cmd_find_state *fsp;
struct cmd_find_state fs;
int flags = FORMAT_NOJOBS; int flags = FORMAT_NOJOBS;
if (cmd_find_valid_state(&pi->fs)) if (cmd_find_valid_state(&pi->fs))
fs = &pi->fs; fsp = &pi->fs;
else else {
fs = NULL; cmd_find_from_client(&fs, c, 0);
fsp = &fs;
}
ft = format_create(NULL, pi->item, FORMAT_NONE, flags); ft = format_create(NULL, pi->item, FORMAT_NONE, flags);
if (fs != NULL) format_defaults(ft, c, fsp->s, fsp->wl, fsp->wp);
format_defaults(ft, c, fs->s, fs->wl, fs->wp);
else
format_defaults(ft, c, NULL, NULL, NULL);
$$ = format_expand(ft, $1); $$ = format_expand(ft, $1);
format_free(ft); format_free(ft);

1
cmd-queue.c
View File

@@ -102,7 +102,6 @@ cmdq_insert_after(struct cmdq_item *after, struct cmdq_item *item)
} while (item != NULL); } while (item != NULL);
} }
/* Insert a hook. */ /* Insert a hook. */
void void
cmdq_insert_hook(struct session *s, struct cmdq_item *item, cmdq_insert_hook(struct session *s, struct cmdq_item *item,

1
format.c
View File

@@ -962,7 +962,6 @@ format_each(struct format_tree *ft, void (*cb)(const char *, const char *,
} }
} }
/* Add a key-value pair. */ /* Add a key-value pair. */
void void
format_add(struct format_tree *ft, const char *key, const char *fmt, ...) format_add(struct format_tree *ft, const char *key, const char *fmt, ...)

1
key-bindings.c
View File

@@ -69,7 +69,6 @@
" '#{?pane_marked,Unmark,Mark}' 'm' {select-pane -m}" \ " '#{?pane_marked,Unmark,Mark}' 'm' {select-pane -m}" \
" '#{?window_zoomed_flag,Unzoom,Zoom}' 'z' {resize-pane -Z}" " '#{?window_zoomed_flag,Unzoom,Zoom}' 'z' {resize-pane -Z}"
static int key_bindings_cmp(struct key_binding *, struct key_binding *); static int key_bindings_cmp(struct key_binding *, struct key_binding *);
RB_GENERATE_STATIC(key_bindings, key_binding, entry, key_bindings_cmp); RB_GENERATE_STATIC(key_bindings, key_binding, entry, key_bindings_cmp);
static int key_table_cmp(struct key_table *, struct key_table *); static int key_table_cmp(struct key_table *, struct key_table *);

2
tmux.1
View File

@@ -2748,7 +2748,7 @@ and
.Pp .Pp
The The
.Nm .Nm
server has a set of global options which do not apply to any particular server has a set of global server options which do not apply to any particular
window or session or pane. window or session or pane.
These are altered with the These are altered with the
.Ic set-option .Ic set-option

1
window-copy.c
View File

@@ -1108,7 +1108,6 @@ window_copy_cmd_previous_matching_bracket(struct window_copy_cmd_state *cs)
return (WINDOW_COPY_CMD_NOTHING); return (WINDOW_COPY_CMD_NOTHING);
} }
static enum window_copy_cmd_action static enum window_copy_cmd_action
window_copy_cmd_next_matching_bracket(struct window_copy_cmd_state *cs) window_copy_cmd_next_matching_bracket(struct window_copy_cmd_state *cs)
{ {

4
window.c
View File

@@ -1573,6 +1573,10 @@ window_pane_input_callback(struct client *c, int closed, void *data)
wp = window_pane_find_by_id(cdata->wp); wp = window_pane_find_by_id(cdata->wp);
if (wp == NULL || closed || c->flags & CLIENT_DEAD) { if (wp == NULL || closed || c->flags & CLIENT_DEAD) {
if (wp == NULL)
c->flags |= CLIENT_EXIT;
evbuffer_drain(evb, len);
c->stdin_callback = NULL; c->stdin_callback = NULL;
server_client_unref(c); server_client_unref(c);