mirror of
https://github.com/tmux/tmux.git
synced 2024-11-16 01:18:52 +00:00
Trim trailing spaces when matching.
This commit is contained in:
parent
f1100f97f7
commit
bdab595095
8
window.c
8
window.c
@ -19,6 +19,7 @@
|
|||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
|
|
||||||
|
#include <ctype.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <fnmatch.h>
|
#include <fnmatch.h>
|
||||||
@ -1222,6 +1223,7 @@ window_pane_search(struct window_pane *wp, const char *term, int regex,
|
|||||||
char *new = NULL, *line;
|
char *new = NULL, *line;
|
||||||
u_int i;
|
u_int i;
|
||||||
int flags = 0, found;
|
int flags = 0, found;
|
||||||
|
size_t n;
|
||||||
|
|
||||||
if (!regex) {
|
if (!regex) {
|
||||||
if (ignore)
|
if (ignore)
|
||||||
@ -1236,6 +1238,12 @@ window_pane_search(struct window_pane *wp, const char *term, int regex,
|
|||||||
|
|
||||||
for (i = 0; i < screen_size_y(s); i++) {
|
for (i = 0; i < screen_size_y(s); i++) {
|
||||||
line = grid_view_string_cells(s->grid, 0, i, screen_size_x(s));
|
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)
|
if (!regex)
|
||||||
found = (fnmatch(new, line, 0) == 0);
|
found = (fnmatch(new, line, 0) == 0);
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user