summaryrefslogtreecommitdiffstats
path: root/debian/patches/revert-upstream-43e5e80343.diff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-14 19:08:35 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-14 19:08:35 +0000
commit414fa8e12c6180dcb32eb3f6d35034089f434289 (patch)
tree95b3c45469642e5fc86818781fa4347aff04f398 /debian/patches/revert-upstream-43e5e80343.diff
parentAdding debian version 3.4-4. (diff)
downloadtmux-414fa8e12c6180dcb32eb3f6d35034089f434289.tar.xz
tmux-414fa8e12c6180dcb32eb3f6d35034089f434289.zip
Adding debian version 3.4-5.debian/3.4-5
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/revert-upstream-43e5e80343.diff')
-rw-r--r--debian/patches/revert-upstream-43e5e80343.diff79
1 files changed, 79 insertions, 0 deletions
diff --git a/debian/patches/revert-upstream-43e5e80343.diff b/debian/patches/revert-upstream-43e5e80343.diff
new file mode 100644
index 0000000..32f91f1
--- /dev/null
+++ b/debian/patches/revert-upstream-43e5e80343.diff
@@ -0,0 +1,79 @@
+commit 0f5e175cc8df8c047348c06cbc48f664682b58a3
+Author: Romain Francoise <rfrancoise@debian.org>
+Date: Thu May 9 17:19:43 2024 +0200
+Forwarded: not-needed
+
+ Revert "Skip wrapped lines in top level search loop because they will be"
+
+ This reverts commit 43e5e80343185e69a1b864fc48095ede0b898180.
+
+diff --git a/window-copy.c b/window-copy.c
+index a1f18476ad..e5bd3ec10c 100644
+--- a/window-copy.c
++++ b/window-copy.c
+@@ -295,7 +295,6 @@ struct window_copy_mode_data {
+ int timeout; /* search has timed out */
+ #define WINDOW_COPY_SEARCH_TIMEOUT 10000
+ #define WINDOW_COPY_SEARCH_ALL_TIMEOUT 200
+-#define WINDOW_COPY_SEARCH_MAX_LINE 2000
+
+ int jumptype;
+ struct utf8_data *jumpchar;
+@@ -3214,9 +3213,7 @@ window_copy_search_lr_regex(struct grid *gd, u_int *ppx, u_int *psx, u_int py,
+ len = gd->sx - first;
+ endline = gd->hsize + gd->sy - 1;
+ pywrap = py;
+- while (buf != NULL &&
+- pywrap <= endline &&
+- len < WINDOW_COPY_SEARCH_MAX_LINE) {
++ while (buf != NULL && pywrap <= endline) {
+ gl = grid_get_line(gd, pywrap);
+ if (~gl->flags & GRID_LINE_WRAPPED)
+ break;
+@@ -3273,9 +3270,7 @@ window_copy_search_rl_regex(struct grid *gd, u_int *ppx, u_int *psx, u_int py,
+ len = gd->sx - first;
+ endline = gd->hsize + gd->sy - 1;
+ pywrap = py;
+- while (buf != NULL &&
+- pywrap <= endline &&
+- len < WINDOW_COPY_SEARCH_MAX_LINE) {
++ while (buf != NULL && (pywrap <= endline)) {
+ gl = grid_get_line(gd, pywrap);
+ if (~gl->flags & GRID_LINE_WRAPPED)
+ break;
+@@ -3614,11 +3609,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,
+ int direction, int regex)
+ {
+- u_int i, px, sx, ssize = 1;
+- int 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;
+
+ if (regex) {
+ sbuf = xmalloc(ssize);
+@@ -3635,9 +3629,6 @@ window_copy_search_jump(struct window_mode_entry *wme, struct grid *gd,
+
+ if (direction) {
+ for (i = fy; i <= endline; i++) {
+- gl = grid_get_line(gd, i);
+- if (i != endline && gl->flags & GRID_LINE_WRAPPED)
+- continue;
+ if (regex) {
+ found = window_copy_search_lr_regex(gd,
+ &px, &sx, i, fx, gd->sx, &reg);
+@@ -3651,9 +3642,6 @@ window_copy_search_jump(struct window_mode_entry *wme, struct grid *gd,
+ }
+ } else {
+ for (i = fy + 1; endline < i; i--) {
+- gl = grid_get_line(gd, i - 1);
+- if (i != endline && gl->flags & GRID_LINE_WRAPPED)
+- continue;
+ if (regex) {
+ found = window_copy_search_rl_regex(gd,
+ &px, &sx, i - 1, 0, fx + 1, &reg);