updated for version 7.4.155
Problem: ":keeppatterns /pat" does not keep search pattern offset.
Solution: Restore the offset after doing the search.
diff --git a/src/search.c b/src/search.c
index e498576..0341a5e 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1437,7 +1437,7 @@
curwin->w_set_curswant = TRUE;
end_do_search:
- if (options & SEARCH_KEEP)
+ if ((options & SEARCH_KEEP) || cmdmod.keeppatterns)
spats[0].off = old_off;
vim_free(strcopy);
diff --git a/src/testdir/test14.in b/src/testdir/test14.in
index e6816a3..fb987eb 100644
--- a/src/testdir/test14.in
+++ b/src/testdir/test14.in
@@ -56,7 +56,10 @@
:$put =@/
/^substitute
Y:$put =@0
-:/^search()/,$w >>test.out
+/bar /e
+:$put =@0
+-:keeppatterns /xyz
+0dn:/^search()/,$w >>test.out
:qa!
ENDTEST
diff --git a/src/testdir/test14.ok b/src/testdir/test14.ok
index ae3da29..0aa2db3 100644
--- a/src/testdir/test14.ok
+++ b/src/testdir/test14.ok
@@ -23,3 +23,4 @@
foo
^substitute
substitute bar xyz
+xyz
diff --git a/src/version.c b/src/version.c
index 9b017bb..9d3ff57 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 155,
+/**/
154,
/**/
153,
