aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2022-08-03 16:01:11 +0100
committerThomas Adam <thomas@xteddy.org>2022-08-03 16:01:11 +0100
commitc6cf09450a7db6fa6392e5345ef4eafbd0be5281 (patch)
treee770431bedd0504dfd13a1f0b283742729f33699
parent7b8ececd8d76131b29273d62174c70a08211acfc (diff)
parentc6e7568471f35f7a22e199b444adf17c685e86f3 (diff)
downloadrtmux-c6cf09450a7db6fa6392e5345ef4eafbd0be5281.tar.gz
rtmux-c6cf09450a7db6fa6392e5345ef4eafbd0be5281.tar.bz2
rtmux-c6cf09450a7db6fa6392e5345ef4eafbd0be5281.zip
Merge branch 'obsd-master'
-rw-r--r--window-copy.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/window-copy.c b/window-copy.c
index ab7ed5b1..834a2d99 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -3673,6 +3673,7 @@ window_copy_search(struct window_mode_entry *wme, int direction, int regex)
if (direction &&
window_copy_search_mark_at(data, fx, fy, &at) == 0 &&
at > 0 &&
+ data->searchmark != NULL &&
data->searchmark[at] == data->searchmark[at - 1]) {
window_copy_move_after_search_mark(data, &fx, &fy,
wrapflag);
@@ -3705,6 +3706,7 @@ window_copy_search(struct window_mode_entry *wme, int direction, int regex)
&start) == 0) {
while (window_copy_search_mark_at(data, fx, fy,
&at) == 0 &&
+ data->searchmark != NULL &&
data->searchmark[at] ==
data->searchmark[start]) {
data->cx = fx;