summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2017-03-13 10:53:32 +0000
committernicm <nicm@openbsd.org>2017-03-13 10:53:32 +0000
commit38f80cb91f0c5b612f291445967e9c8f53601bcf (patch)
tree7508f4abfe4cc6e7326b4698379608bcc04d9294
parentMake 'ifconfig scan' show WPA information for other APs correctly while (diff)
downloadwireguard-openbsd-38f80cb91f0c5b612f291445967e9c8f53601bcf.tar.xz
wireguard-openbsd-38f80cb91f0c5b612f291445967e9c8f53601bcf.zip
Revert previous, breaks normal short targets, reported by Theo Buehler.
-rw-r--r--usr.bin/tmux/cmd-find.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tmux/cmd-find.c b/usr.bin/tmux/cmd-find.c
index 67ad56d3131..28b131c4f05 100644
--- a/usr.bin/tmux/cmd-find.c
+++ b/usr.bin/tmux/cmd-find.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-find.c,v 1.41 2017/03/11 15:16:08 nicm Exp $ */
+/* $OpenBSD: cmd-find.c,v 1.42 2017/03/13 10:53:32 nicm Exp $ */
/*
* Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -483,8 +483,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)
@@ -674,8 +674,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);
}