diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-07-03 10:01:20 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-07-03 10:01:20 +0100 |
| commit | 0fa306d73c64c9cb8a67937b53047b0ee791451b (patch) | |
| tree | 762c0a462031e2eb0df9ac31d6691738100bcb73 | |
| parent | a284664e718a6eb3cd5f0507331a183037c0d6dd (diff) | |
| parent | 43e1577b5d6c40369eb353322f68a12b36d609b0 (diff) | |
| download | rtmux-0fa306d73c64c9cb8a67937b53047b0ee791451b.tar.gz rtmux-0fa306d73c64c9cb8a67937b53047b0ee791451b.tar.bz2 rtmux-0fa306d73c64c9cb8a67937b53047b0ee791451b.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | cmd-select-pane.c | 4 | ||||
| -rw-r--r-- | tmux.1 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmd-select-pane.c b/cmd-select-pane.c index 313deefe..b0c78d74 100644 --- a/cmd-select-pane.c +++ b/cmd-select-pane.c @@ -205,7 +205,7 @@ cmd_select_pane_exec(struct cmd *self, struct cmdq_item *item) 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); else 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'))) server_redraw_window(w); 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); else if (window_set_active_pane(w, wp, 1)) cmd_find_from_winlink_pane(current, wl, wp, 0); @@ -2947,7 +2947,7 @@ specifies a prefix to print before each key and .Fl 1 lists only the first matching key. .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 .Op Fl FHlMRX .Op Fl N Ar repeat-count |