mirror of https://github.com/tmux/tmux.git
Merge branch 'obsd-master'
commit
0fa306d73c
|
@ -205,7 +205,7 @@ cmd_select_pane_exec(struct cmd *self, struct cmdq_item *item)
|
||||||
return (CMD_RETURN_NORMAL);
|
return (CMD_RETURN_NORMAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (c->session != NULL && (c->flags & CLIENT_ACTIVEPANE))
|
if (c != NULL && c->session != NULL && (c->flags & CLIENT_ACTIVEPANE))
|
||||||
activewp = server_client_get_pane(c);
|
activewp = server_client_get_pane(c);
|
||||||
else
|
else
|
||||||
activewp = w->active;
|
activewp = w->active;
|
||||||
|
@ -214,7 +214,7 @@ cmd_select_pane_exec(struct cmd *self, struct cmdq_item *item)
|
||||||
if (window_push_zoom(w, args_has(args, 'Z')))
|
if (window_push_zoom(w, args_has(args, 'Z')))
|
||||||
server_redraw_window(w);
|
server_redraw_window(w);
|
||||||
window_redraw_active_switch(w, wp);
|
window_redraw_active_switch(w, wp);
|
||||||
if (c->session != NULL && (c->flags & CLIENT_ACTIVEPANE))
|
if (c != NULL && c->session != NULL && (c->flags & CLIENT_ACTIVEPANE))
|
||||||
server_client_set_pane(c, wp);
|
server_client_set_pane(c, wp);
|
||||||
else if (window_set_active_pane(w, wp, 1))
|
else if (window_set_active_pane(w, wp, 1))
|
||||||
cmd_find_from_winlink_pane(current, wl, wp, 0);
|
cmd_find_from_winlink_pane(current, wl, wp, 0);
|
||||||
|
|
2
tmux.1
2
tmux.1
|
@ -2947,7 +2947,7 @@ specifies a prefix to print before each key and
|
||||||
.Fl 1
|
.Fl 1
|
||||||
lists only the first matching key.
|
lists only the first matching key.
|
||||||
.Fl a
|
.Fl a
|
||||||
lists the command for keys that do have a note rather than skipping them.
|
lists the command for keys that do not have a note rather than skipping them.
|
||||||
.It Xo Ic send-keys
|
.It Xo Ic send-keys
|
||||||
.Op Fl FHlMRX
|
.Op Fl FHlMRX
|
||||||
.Op Fl N Ar repeat-count
|
.Op Fl N Ar repeat-count
|
||||||
|
|
Loading…
Reference in New Issue