circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-03-09 17:30:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2026-03-09 16:01:09 +00:00
parent 6c2dd193cf 2efa762c2b
commit 0d77555c97
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd-list-keys.c
View File

@@ -195,10 +195,6 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item)
} }
sort_crit.reversed = args_has(args, 'r'); sort_crit.reversed = args_has(args, 'r');
prefix = cmd_list_keys_get_prefix(args);
single = args_has(args, '1');
notes_only = args_has(args, 'N');
if ((tablename = args_get(args, 'T')) != NULL) { if ((tablename = args_get(args, 'T')) != NULL) {
table = key_bindings_get_table(tablename, 0); table = key_bindings_get_table(tablename, 0);
if (table == NULL) { if (table == NULL) {
@@ -207,6 +203,10 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item)
} }
} }
prefix = cmd_list_keys_get_prefix(args);
single = args_has(args, '1');
notes_only = args_has(args, 'N');
if ((template = args_get(args, 'F')) == NULL) if ((template = args_get(args, 'F')) == NULL)
template = LIST_KEYS_TEMPLATE; template = LIST_KEYS_TEMPLATE;

4
cmd-parse.y
View File

@@ -1604,7 +1604,9 @@ yylex_token_tilde(char **buf, size_t *len)
if (*name == '\0') { if (*name == '\0') {
envent = environ_find(global_environ, "HOME"); envent = environ_find(global_environ, "HOME");
if (envent != NULL && *envent->value != '\0') if (envent != NULL &&
envent->value != NULL &&
*envent->value != '\0')
home = envent->value; home = envent->value;
else if ((pw = getpwuid(getuid())) != NULL) else if ((pw = getpwuid(getuid())) != NULL)
home = pw->pw_dir; home = pw->pw_dir;

3
control.c
View File

@@ -1045,6 +1045,9 @@ control_check_subs_timer(__unused int fd, __unused short events, void *data)
log_debug("%s: timer fired", __func__); log_debug("%s: timer fired", __func__);
evtimer_add(&cs->subs_timer, &tv); evtimer_add(&cs->subs_timer, &tv);
if (s == NULL)
return;
/* Find which subscription types are present. */ /* Find which subscription types are present. */
RB_FOREACH(csub, control_subs, &cs->subs) { RB_FOREACH(csub, control_subs, &cs->subs) {
switch (csub->type) { switch (csub->type) {