===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-find-window.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- src/usr.bin/tmux/cmd-find-window.c	2018/08/20 15:00:42	1.45
+++ src/usr.bin/tmux/cmd-find-window.c	2019/06/20 20:31:04	1.46
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-find-window.c,v 1.45 2018/08/20 15:00:42 nicm Exp $ */
+/* $OpenBSD: cmd-find-window.c,v 1.46 2019/06/20 20:31:04 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -32,8 +32,8 @@
 	.name = "find-window",
 	.alias = "findw",
 
-	.args = { "CNt:TZ", 1, 1 },
-	.usage = "[-CNTZ] " CMD_TARGET_PANE_USAGE " match-string",
+	.args = { "CNrt:TZ", 1, 1 },
+	.usage = "[-CNrTZ] " CMD_TARGET_PANE_USAGE " match-string",
 
 	.target = { 't', CMD_FIND_PANE, 0 },
 
@@ -57,30 +57,59 @@
 	if (!C && !N && !T)
 		C = N = T = 1;
 
-	if (C && N && T) {
-		xasprintf(&filter,
-		    "#{||:"
-		    "#{C:%s},#{||:#{m:*%s*,#{window_name}},"
-		    "#{m:*%s*,#{pane_title}}}}",
-		    s, s, s);
-	} else if (C && N) {
-		xasprintf(&filter,
-		    "#{||:#{C:%s},#{m:*%s*,#{window_name}}}",
-		    s, s);
-	} else if (C && T) {
-		xasprintf(&filter,
-		    "#{||:#{C:%s},#{m:*%s*,#{pane_title}}}",
-		    s, s);
-	} else if (N && T) {
-		xasprintf(&filter,
-		    "#{||:#{m:*%s*,#{window_name}},#{m:*%s*,#{pane_title}}}",
-		    s, s);
-	} else if (C)
-		xasprintf(&filter, "#{C:%s}", s);
-	else if (N)
-		xasprintf(&filter, "#{m:*%s*,#{window_name}}", s);
-	else
-		xasprintf(&filter, "#{m:*%s*,#{pane_title}}", s);
+	if (!args_has(args, 'r')) {
+		if (C && N && T) {
+			xasprintf(&filter,
+			    "#{||:"
+			    "#{C:%s},#{||:#{m:*%s*,#{window_name}},"
+			    "#{m:*%s*,#{pane_title}}}}",
+			    s, s, s);
+		} else if (C && N) {
+			xasprintf(&filter,
+			    "#{||:#{C:%s},#{m:*%s*,#{window_name}}}",
+			    s, s);
+		} else if (C && T) {
+			xasprintf(&filter,
+			    "#{||:#{C:%s},#{m:*%s*,#{pane_title}}}",
+			    s, s);
+		} else if (N && T) {
+			xasprintf(&filter,
+			    "#{||:#{m:*%s*,#{window_name}},"
+			    "#{m:*%s*,#{pane_title}}}",
+			    s, s);
+		} else if (C)
+			xasprintf(&filter, "#{C:%s}", s);
+		else if (N)
+			xasprintf(&filter, "#{m:*%s*,#{window_name}}", s);
+		else
+			xasprintf(&filter, "#{m:*%s*,#{pane_title}}", s);
+	} else {
+		if (C && N && T) {
+			xasprintf(&filter,
+			    "#{||:"
+			    "#{C/r:%s},#{||:#{m/r:%s,#{window_name}},"
+			    "#{m/r:%s,#{pane_title}}}}",
+			    s, s, s);
+		} else if (C && N) {
+			xasprintf(&filter,
+			    "#{||:#{C/r:%s},#{m/r:%s,#{window_name}}}",
+			    s, s);
+		} else if (C && T) {
+			xasprintf(&filter,
+			    "#{||:#{C/r:%s},#{m/r:%s,#{pane_title}}}",
+			    s, s);
+		} else if (N && T) {
+			xasprintf(&filter,
+			    "#{||:#{m/r:%s,#{window_name}},"
+			    "#{m/r:%s,#{pane_title}}}",
+			    s, s);
+		} else if (C)
+			xasprintf(&filter, "#{C/r:%s}", s);
+		else if (N)
+			xasprintf(&filter, "#{m/r:%s,#{window_name}}", s);
+		else
+			xasprintf(&filter, "#{m/r:%s,#{pane_title}}", s);
+	}
 
 	new_args = args_parse("", 1, &argv);
 	if (args_has(args, 'Z'))