=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v retrieving revision 1.349 retrieving revision 1.350 diff -u -r1.349 -r1.350 --- src/usr.bin/tmux/window-copy.c 2024/05/14 07:40:39 1.349 +++ src/usr.bin/tmux/window-copy.c 2024/05/14 09:32:37 1.350 @@ -1,4 +1,4 @@ -/* $OpenBSD: window-copy.c,v 1.349 2024/05/14 07:40:39 nicm Exp $ */ +/* $OpenBSD: window-copy.c,v 1.350 2024/05/14 09:32:37 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -3614,14 +3614,11 @@ struct grid *sgd, u_int fx, u_int fy, u_int endline, int cis, int wrap, int direction, int regex) { - u_int i, px, sx, ssize = 1; - int wrapped, found = 0, cflags = REG_EXTENDED; - char *sbuf; - regex_t reg; - struct grid_line *gl; + u_int i, px, sx, ssize = 1; + int found = 0, cflags = REG_EXTENDED; + char *sbuf; + regex_t reg; - wrapped = options_get_number(global_options, "search-wrapped-lines"); - if (regex) { sbuf = xmalloc(ssize); sbuf[0] = '\0'; @@ -3637,11 +3634,6 @@ if (direction) { for (i = fy; i <= endline; i++) { - gl = grid_get_line(gd, i); - if (!wrapped && - i != endline && - gl->flags & GRID_LINE_WRAPPED) - continue; if (regex) { found = window_copy_search_lr_regex(gd, &px, &sx, i, fx, gd->sx, ®); @@ -3655,11 +3647,6 @@ } } else { for (i = fy + 1; endline < i; i--) { - gl = grid_get_line(gd, i - 1); - if (!wrapped && - i != endline && - gl->flags & GRID_LINE_WRAPPED) - continue; if (regex) { found = window_copy_search_rl_regex(gd, &px, &sx, i - 1, 0, fx + 1, ®);