circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-06 17:49:52 +00:00
Code Issues Projects Releases Wiki Activity

Stop at the right end line when walking wrapped lines, GitHub issue 5479.

Browse Source
This commit is contained in:
nicm
2026-08-19 19:55:04 +00:00
committed by tmux update bot
parent b28b1b7b9a
commit 50d0348b64
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
window-copy.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: window-copy.c,v 1.425 2026/08/05 12:23:25 nicm Exp $ */ /* $OpenBSD: window-copy.c,v 1.426 2026/08/19 19:55:04 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -4093,7 +4093,7 @@ window_copy_search_lr_regex(struct grid *gd, u_int *ppx, u_int *psx, u_int py,
endline = gd->hsize + gd->sy - 1; endline = gd->hsize + gd->sy - 1;
pywrap = py; pywrap = py;
while (buf != NULL && while (buf != NULL &&
pywrap <= endline && pywrap < endline &&
len < WINDOW_COPY_SEARCH_MAX_LINE) { len < WINDOW_COPY_SEARCH_MAX_LINE) {
gl = grid_get_line(gd, pywrap); gl = grid_get_line(gd, pywrap);
if (~gl->flags & GRID_LINE_WRAPPED) if (~gl->flags & GRID_LINE_WRAPPED)
@@ -4152,7 +4152,7 @@ window_copy_search_rl_regex(struct grid *gd, u_int *ppx, u_int *psx, u_int py,
endline = gd->hsize + gd->sy - 1; endline = gd->hsize + gd->sy - 1;
pywrap = py; pywrap = py;
while (buf != NULL && while (buf != NULL &&
pywrap <= endline && pywrap < endline &&
len < WINDOW_COPY_SEARCH_MAX_LINE) { len < WINDOW_COPY_SEARCH_MAX_LINE) {
gl = grid_get_line(gd, pywrap); gl = grid_get_line(gd, pywrap);
if (~gl->flags & GRID_LINE_WRAPPED) if (~gl->flags & GRID_LINE_WRAPPED)
@@ -4353,6 +4353,7 @@ window_copy_cstrtocellpos(struct grid *gd, u_int ncells, u_int *ppx, u_int *ppy,
break; break;
} }
} }
ncells = cell;
/* Locate starting cell. */ /* Locate starting cell. */
cell = 0; cell = 0;