diff options
author | Thomas Adam <thomas@xteddy.org> | 2016-10-15 02:01:12 +0100 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2016-10-15 02:01:12 +0100 |
commit | 623e54788e77068779933eb60a042e5a82f32673 (patch) | |
tree | 02ce8da6ff4062b9d4c4b9846960f6f9849e0b2b /cmd-find.c | |
parent | 3d2686a236b4ffee762ada8ebb493d8db91f7375 (diff) | |
parent | 3f138dc40c37ddee021b92e5d29676ed96b6cab8 (diff) |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-find.c')
-rw-r--r-- | cmd-find.c | 18 |
1 files changed, 18 insertions, 0 deletions
@@ -903,6 +903,23 @@ cmd_find_from_winlink(struct cmd_find_state *fs, struct session *s, return (0); } +/* Find state from a session and window. */ +int +cmd_find_from_session_window(struct cmd_find_state *fs, struct session *s, + struct window *w) +{ + cmd_find_clear_state(fs, NULL, 0); + + fs->s = s; + fs->w = w; + if (cmd_find_best_winlink_with_window(fs) != 0) + return (-1); + fs->wp = fs->w->active; + + cmd_find_log_state(__func__, fs); + return (0); +} + /* Find state from a window. */ int cmd_find_from_window(struct cmd_find_state *fs, struct window *w) @@ -914,6 +931,7 @@ cmd_find_from_window(struct cmd_find_state *fs, struct window *w) return (-1); if (cmd_find_best_winlink_with_window(fs) != 0) return (-1); + fs->wp = fs->w->active; cmd_find_log_state(__func__, fs); return (0); |