diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-08-08 12:01:15 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-08-08 12:01:15 +0100 |
| commit | 4bb5bb9450e7890e42ec807c9236a455f6046df7 (patch) | |
| tree | 3b63fda2b600dbd43620896c92c92b20fceca0de | |
| parent | e7b1e05bbda29c71963e7f9ba8f9f656eb8928ec (diff) | |
| parent | 31b06571aa565c347c89458a1b357c6cd5d289be (diff) | |
| download | rtmux-4bb5bb9450e7890e42ec807c9236a455f6046df7.tar.gz rtmux-4bb5bb9450e7890e42ec807c9236a455f6046df7.tar.bz2 rtmux-4bb5bb9450e7890e42ec807c9236a455f6046df7.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | cmd-select-pane.c | 3 | ||||
| -rw-r--r-- | cmd-select-window.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cmd-select-pane.c b/cmd-select-pane.c index 86152bed..03e48513 100644 --- a/cmd-select-pane.c +++ b/cmd-select-pane.c @@ -156,7 +156,8 @@ cmd_select_pane_exec(struct cmd *self, struct cmdq_item *item) } window_redraw_active_switch(w, wp); if (window_set_active_pane(w, wp)) { - cmd_find_from_winlink(current, wl); + cmd_find_from_winlink_pane(current, wl, wp); + hooks_insert(s->hooks, item, current, "after-select-pane"); server_status_window(w); server_redraw_window_borders(w); } diff --git a/cmd-select-window.c b/cmd-select-window.c index 6cfaf535..27a66b04 100644 --- a/cmd-select-window.c +++ b/cmd-select-window.c @@ -117,8 +117,9 @@ cmd_select_window_exec(struct cmd *self, struct cmdq_item *item) return (CMD_RETURN_ERROR); } } - cmd_find_from_session(&item->shared->current, s); + cmd_find_from_session(current, s); server_redraw_session(s); + hooks_insert(s->hooks, item, current, "after-select-window"); } else { /* * If -T and select-window is invoked on same window as @@ -136,6 +137,7 @@ cmd_select_window_exec(struct cmd *self, struct cmdq_item *item) cmd_find_from_session(current, s); server_redraw_session(s); } + hooks_insert(s->hooks, item, current, "after-select-window"); } recalculate_sizes(); |