circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-22 04:18:47 +00:00
Code Issues Projects Releases Wiki Activity

Revert part of the change for GitHub issue 3675 because it does not work

Browse Source 
correctly, it was intended to skip lines that are already being searched
as part of a previous wrapped line but in fact is skipping all lines
except the last in wrapped lines.

Also revert the search-wrapped-lines option (I didn't realize it was
intended to work around this).
This commit is contained in:
nicm 2024-05-14 09:32:37 +00:00
parent c9616700ca
commit 5b5004e5ac
3 changed files with 4 additions and 33 deletions

8
options-table.c
View File

@ -384,14 +384,6 @@ const struct options_table_entry options_table[] = {
.text = "Maximum number of commands to keep in history." .text = "Maximum number of commands to keep in history."
}, },
{ .name = "search-wrapped-lines",
.type = OPTIONS_TABLE_FLAG,
.scope = OPTIONS_TABLE_SERVER,
.default_num = 1,
.text = "Whether to include full wrapped lines when searching for "
"text in copy mode."
},
{ .name = "set-clipboard", { .name = "set-clipboard",
.type = OPTIONS_TABLE_CHOICE, .type = OPTIONS_TABLE_CHOICE,
.scope = OPTIONS_TABLE_SERVER, .scope = OPTIONS_TABLE_SERVER,

8
tmux.1
View File

@ -3795,14 +3795,6 @@ each client.
.It Ic prompt-history-limit Ar number .It Ic prompt-history-limit Ar number
Set the number of history items to save in the history file for each type of Set the number of history items to save in the history file for each type of
command prompt. command prompt.
.It Xo Ic search-wrapped-lines
.Op Ic on | off
.Xc
Defines how
.Nm
handles wrapped lines when searching in copy mode.
When disabled, lines are truncated and searching is faster, but matches may be
missed.
.It Xo Ic set-clipboard .It Xo Ic set-clipboard
.Op Ic on | external | off .Op Ic on | external | off
.Xc .Xc

21
window-copy.c
View File

@ -3614,13 +3614,10 @@ window_copy_search_jump(struct window_mode_entry *wme, struct grid *gd,
struct grid *sgd, u_int fx, u_int fy, u_int endline, int cis, int wrap, struct grid *sgd, u_int fx, u_int fy, u_int endline, int cis, int wrap,
int direction, int regex) int direction, int regex)
{ {
u_int i, px, sx, ssize = 1; u_int i, px, sx, ssize = 1;
int wrapped, found = 0, cflags = REG_EXTENDED; int found = 0, cflags = REG_EXTENDED;
char *sbuf; char *sbuf;
regex_t reg; regex_t reg;
struct grid_line *gl;
wrapped = options_get_number(global_options, "search-wrapped-lines");
if (regex) { if (regex) {
sbuf = xmalloc(ssize); sbuf = xmalloc(ssize);
@ -3637,11 +3634,6 @@ window_copy_search_jump(struct window_mode_entry *wme, struct grid *gd,
if (direction) { if (direction) {
for (i = fy; i <= endline; i++) { for (i = fy; i <= endline; i++) {
gl = grid_get_line(gd, i);
if (!wrapped &&
i != endline &&
gl->flags & GRID_LINE_WRAPPED)
continue;
if (regex) { if (regex) {
found = window_copy_search_lr_regex(gd, found = window_copy_search_lr_regex(gd,
&px, &sx, i, fx, gd->sx, &reg); &px, &sx, i, fx, gd->sx, &reg);
@ -3655,11 +3647,6 @@ window_copy_search_jump(struct window_mode_entry *wme, struct grid *gd,
} }
} else { } else {
for (i = fy + 1; endline < i; i--) { 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) { if (regex) {
found = window_copy_search_rl_regex(gd, found = window_copy_search_rl_regex(gd,
&px, &sx, i - 1, 0, fx + 1, &reg); &px, &sx, i - 1, 0, fx + 1, &reg);