Merge branch 'obsd-master'

1 files changed, 8 insertions, 0 deletions

diff --git a/window.c b/window.c
index 89a4d8c2..33e21d4c 100644
--- a/window.c
+++ b/window.c
@@ -19,6 +19,7 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
+#include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <fnmatch.h>
@@ -1223,6 +1224,7 @@ window_pane_search(struct window_pane *wp, const char *term, int regex,
 	char		*new = NULL, *line;
 	u_int		 i;
 	int		 flags = 0, found;
+	size_t		 n;
 
 	if (!regex) {
 		if (ignore)
@@ -1237,6 +1239,12 @@ window_pane_search(struct window_pane *wp, const char *term, int regex,
 
 	for (i = 0; i < screen_size_y(s); i++) {
 		line = grid_view_string_cells(s->grid, 0, i, screen_size_x(s));
+		for (n = strlen(line); n > 0; n--) {
+			if (!isspace((u_char)line[n - 1]))
+				break;
+			line[n - 1] = '\0';
+		}
+		log_debug("%s: %s", __func__, line);
 		if (!regex)
 			found = (fnmatch(new, line, 0) == 0);
 		else