Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2017-03-13 12:01:13 +00:00
commit 12c6c723a9

View File

@ -482,8 +482,8 @@ cmd_find_get_window(struct cmd_find_state *fs, const char *window)
if (cmd_find_get_window_with_session(fs, window) == 0) if (cmd_find_get_window_with_session(fs, window) == 0)
return (0); return (0);
/* Try as a session if it looks like a session. */ /* Otherwise try as a session itself. */
if (*window == '$' && cmd_find_get_session(fs, window) == 0) { if (cmd_find_get_session(fs, window) == 0) {
fs->wl = fs->s->curw; fs->wl = fs->s->curw;
fs->w = fs->wl->window; fs->w = fs->wl->window;
if (~fs->flags & CMD_FIND_WINDOW_INDEX) if (~fs->flags & CMD_FIND_WINDOW_INDEX)
@ -673,8 +673,8 @@ cmd_find_get_pane(struct cmd_find_state *fs, const char *pane)
if (cmd_find_get_pane_with_window(fs, pane) == 0) if (cmd_find_get_pane_with_window(fs, pane) == 0)
return (0); return (0);
/* Try as a window if it looks like a window. */ /* Otherwise try as a window itself (this will also try as session). */
if (*pane == '@' && cmd_find_get_window(fs, pane) == 0) { if (cmd_find_get_window(fs, pane) == 0) {
fs->wp = fs->w->active; fs->wp = fs->w->active;
return (0); return (0);
} }