aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-03-13 12:01:13 +0000
committerThomas Adam <thomas@xteddy.org>2017-03-13 12:01:13 +0000
commit12c6c723a9dad969bc9865f7ecd76f3ea7251524 (patch)
tree73e4b869c82a3c09e017d4e1dc25f7b990adaec9
parent266e662fae06232b4154f1ac7194ea9e772dc38b (diff)
parentfd652101392e5f8a3e6e59ea823d1d3df0134b05 (diff)
downloadrtmux-12c6c723a9dad969bc9865f7ecd76f3ea7251524.tar.gz
rtmux-12c6c723a9dad969bc9865f7ecd76f3ea7251524.tar.bz2
rtmux-12c6c723a9dad969bc9865f7ecd76f3ea7251524.zip
Merge branch 'obsd-master'
-rw-r--r--cmd-find.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd-find.c b/cmd-find.c
index d2ebd988..a938276e 100644
--- a/cmd-find.c
+++ b/cmd-find.c
@@ -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)
return (0);
- /* Try as a session if it looks like a session. */
- if (*window == '$' && cmd_find_get_session(fs, window) == 0) {
+ /* Otherwise try as a session itself. */
+ if (cmd_find_get_session(fs, window) == 0) {
fs->wl = fs->s->curw;
fs->w = fs->wl->window;
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)
return (0);
- /* Try as a window if it looks like a window. */
- if (*pane == '@' && cmd_find_get_window(fs, pane) == 0) {
+ /* Otherwise try as a window itself (this will also try as session). */
+ if (cmd_find_get_window(fs, pane) == 0) {
fs->wp = fs->w->active;
return (0);
}