|
 |
8b9a1c |
To: vim_dev@googlegroups.com
|
|
|
8b9a1c |
Subject: Patch 7.4.155
|
|
|
8b9a1c |
Fcc: outbox
|
|
|
8b9a1c |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
8b9a1c |
Mime-Version: 1.0
|
|
|
8b9a1c |
Content-Type: text/plain; charset=UTF-8
|
|
|
8b9a1c |
Content-Transfer-Encoding: 8bit
|
|
|
8b9a1c |
------------
|
|
|
8b9a1c |
|
|
|
8b9a1c |
Patch 7.4.155
|
|
|
8b9a1c |
Problem: ":keeppatterns /pat" does not keep search pattern offset.
|
|
|
8b9a1c |
Solution: Restore the offset after doing the search.
|
|
|
8b9a1c |
Files: src/search.c, src/testdir/test14.in, src/testdir/test14.ok
|
|
|
8b9a1c |
|
|
|
8b9a1c |
|
|
|
8b9a1c |
*** ../vim-7.4.154/src/search.c 2014-01-14 15:53:47.000000000 +0100
|
|
|
8b9a1c |
--- src/search.c 2014-01-14 21:27:32.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 1437,1443 ****
|
|
|
8b9a1c |
curwin->w_set_curswant = TRUE;
|
|
|
8b9a1c |
|
|
|
8b9a1c |
end_do_search:
|
|
|
8b9a1c |
! if (options & SEARCH_KEEP)
|
|
|
8b9a1c |
spats[0].off = old_off;
|
|
|
8b9a1c |
vim_free(strcopy);
|
|
|
8b9a1c |
|
|
|
8b9a1c |
--- 1437,1443 ----
|
|
|
8b9a1c |
curwin->w_set_curswant = TRUE;
|
|
|
8b9a1c |
|
|
|
8b9a1c |
end_do_search:
|
|
|
8b9a1c |
! if ((options & SEARCH_KEEP) || cmdmod.keeppatterns)
|
|
|
8b9a1c |
spats[0].off = old_off;
|
|
|
8b9a1c |
vim_free(strcopy);
|
|
|
8b9a1c |
|
|
|
8b9a1c |
*** ../vim-7.4.154/src/testdir/test14.in 2014-01-14 15:53:47.000000000 +0100
|
|
|
8b9a1c |
--- src/testdir/test14.in 2014-01-14 21:13:39.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 56,62 ****
|
|
|
8b9a1c |
:$put =@/
|
|
|
8b9a1c |
/^substitute
|
|
|
8b9a1c |
Y:$put =@0
|
|
|
8b9a1c |
! :/^search()/,$w >>test.out
|
|
|
8b9a1c |
:qa!
|
|
|
8b9a1c |
ENDTEST
|
|
|
8b9a1c |
|
|
|
8b9a1c |
--- 56,65 ----
|
|
|
8b9a1c |
:$put =@/
|
|
|
8b9a1c |
/^substitute
|
|
|
8b9a1c |
Y:$put =@0
|
|
|
8b9a1c |
! /bar /e
|
|
|
8b9a1c |
! :$put =@0
|
|
|
8b9a1c |
! -:keeppatterns /xyz
|
|
|
8b9a1c |
! 0dn:/^search()/,$w >>test.out
|
|
|
8b9a1c |
:qa!
|
|
|
8b9a1c |
ENDTEST
|
|
|
8b9a1c |
|
|
|
8b9a1c |
*** ../vim-7.4.154/src/testdir/test14.ok 2014-01-14 15:53:47.000000000 +0100
|
|
|
8b9a1c |
--- src/testdir/test14.ok 2014-01-14 21:16:23.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 23,25 ****
|
|
|
8b9a1c |
--- 23,26 ----
|
|
|
8b9a1c |
foo
|
|
|
8b9a1c |
^substitute
|
|
|
8b9a1c |
substitute bar xyz
|
|
|
8b9a1c |
+ xyz
|
|
|
8b9a1c |
*** ../vim-7.4.154/src/version.c 2014-01-14 19:44:30.000000000 +0100
|
|
|
8b9a1c |
--- src/version.c 2014-01-14 21:28:24.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 740,741 ****
|
|
|
8b9a1c |
--- 740,743 ----
|
|
|
8b9a1c |
{ /* Add new patch number below this line */
|
|
|
8b9a1c |
+ /**/
|
|
|
8b9a1c |
+ 155,
|
|
|
8b9a1c |
/**/
|
|
|
8b9a1c |
|
|
|
8b9a1c |
--
|
|
|
8b9a1c |
hundred-and-one symptoms of being an internet addict:
|
|
|
8b9a1c |
164. You got out to buy software, instead of going out for a beer.
|
|
|
8b9a1c |
|
|
|
8b9a1c |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
8b9a1c |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
8b9a1c |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
8b9a1c |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|