Merge branch 'obsd-master'

Conflicts:
	window-buffer.c

cmd-find-window.c

@@ -79,7 +79,7 @@ cmd_find_window_exec(struct cmd *self, struct cmdq_item *item)
 		xasprintf(&filter, "#{C:%s}", s);
 	else if (N)
 		xasprintf(&filter, "#{m:*%s*,#{window_name}}", s);
-	else if (T)
+	else
 		xasprintf(&filter, "#{m:*%s*,#{pane_title}}", s);
 
 	new_args = args_parse("", 1, &argv);

utf8.c

@@ -427,8 +427,7 @@ utf8_rtrimcstr(const char *s, u_int width)
 	next = end - 1;
 
 	at = 0;
-	for (;;)
-	{
+	for (;;) {
 		if (at + next->width > width) {
 			next++;
 			break;