diff options
author | Josh Rahm <rahm@google.com> | 2022-07-25 11:10:13 -0600 |
---|---|---|
committer | Josh Rahm <rahm@google.com> | 2022-07-25 11:10:13 -0600 |
commit | fb15fd116097b98c1b839cfdc76a7d84e206e6d5 (patch) | |
tree | 1f16745ca93e1001718eee4699837c7fdcac0d82 | |
parent | b11548e3db4361cd8312ffbd27472823bdab4d62 (diff) | |
parent | 9d9445a48e626731e9384b6b9cda367cd4cef5d3 (diff) | |
download | rtmux-fb15fd116097b98c1b839cfdc76a7d84e206e6d5.tar.gz rtmux-fb15fd116097b98c1b839cfdc76a7d84e206e6d5.tar.bz2 rtmux-fb15fd116097b98c1b839cfdc76a7d84e206e6d5.zip |
Merge remote-tracking branch 'upstream/master' into rahm
-rw-r--r-- | window-copy.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/window-copy.c b/window-copy.c index b955d222..ab7ed5b1 100644 --- a/window-copy.c +++ b/window-copy.c @@ -3612,6 +3612,8 @@ window_copy_search(struct window_mode_entry *wme, int direction, int regex) data->searchall = 0; } else visible_only = (strcmp(wp->searchstr, str) == 0); + if (visible_only == 0 && data->searchmark != NULL) + window_copy_clear_marks(wme); free(wp->searchstr); wp->searchstr = xstrdup(str); wp->searchregex = regex; |