diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2012-03-18 02:12:24 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2012-03-18 02:12:24 +0000 |
| commit | e4eb43ec718357ad692471683a65ef6aeee3720a (patch) | |
| tree | ee0fc6c45ebd046e03c141ee327dca012bae5f44 /window-copy.c | |
| parent | dc83ba0372380d9f65a720685e38134675a982d8 (diff) | |
| download | rtmux-e4eb43ec718357ad692471683a65ef6aeee3720a.tar.gz rtmux-e4eb43ec718357ad692471683a65ef6aeee3720a.tar.bz2 rtmux-e4eb43ec718357ad692471683a65ef6aeee3720a.zip | |
Sync OpenBSD patchset 1066:
Add a wrap-search option to turn off wrapping of searches in copy
mode. From Jacobo de Vera.
Diffstat (limited to 'window-copy.c')
| -rw-r--r-- | window-copy.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/window-copy.c b/window-copy.c index 3ba650e2..68e260dc 100644 --- a/window-copy.c +++ b/window-copy.c @@ -984,11 +984,12 @@ window_copy_search_up(struct window_pane *wp, const char *searchstr) struct grid_cell gc; size_t searchlen; u_int i, last, fx, fy, px; - int utf8flag, n, wrapped; + int utf8flag, n, wrapped, wrapflag; if (*searchstr == '\0') return; utf8flag = options_get_number(&wp->window->options, "utf8"); + wrapflag = options_get_number(&wp->window->options, "wrap-search"); searchlen = screen_write_strlen(utf8flag, "%s", searchstr); screen_init(&ss, searchlen, 1, 0); @@ -1021,7 +1022,7 @@ retry: break; } } - if (!n && !wrapped) { + if (wrapflag && !n && !wrapped) { fx = gd->sx - 1; fy = gd->hsize + gd->sy - 1; wrapped = 1; @@ -1041,11 +1042,12 @@ window_copy_search_down(struct window_pane *wp, const char *searchstr) struct grid_cell gc; size_t searchlen; u_int i, first, fx, fy, px; - int utf8flag, n, wrapped; + int utf8flag, n, wrapped, wrapflag; if (*searchstr == '\0') return; utf8flag = options_get_number(&wp->window->options, "utf8"); + wrapflag = options_get_number(&wp->window->options, "wrap-search"); searchlen = screen_write_strlen(utf8flag, "%s", searchstr); screen_init(&ss, searchlen, 1, 0); @@ -1078,7 +1080,7 @@ retry: break; } } - if (!n && !wrapped) { + if (wrapflag && !n && !wrapped) { fx = 0; fy = 0; wrapped = 1; |