Patch 7.3.871
Problem:    search('^$', 'c') does not use the empty match under the cursor.
Solution:   Special handling of the 'c' flag. (Christian Brabandt)
            Add tests.
Files:      src/search.c, src/testdir/test14.in, src/testdir/test14.ok


*** ../vim-7.3.870/src/search.c 2013-02-20 18:39:07.000000000 +0100
--- src/search.c        2013-03-19 15:23:13.000000000 +0100
***************
*** 727,732 ****
--- 727,734 ----
                                        ++matchcol;
                                }
                            }
+                           if (options & SEARCH_START)
+                               break;
                            if (ptr[matchcol] == NUL
                                    || (nmatched = vim_regexec_multi(&regmatch,
                                              win, buf, lnum + matchpos.lnum,
*** ../vim-7.3.870/src/testdir/test14.in        2010-08-15 21:57:29.000000000 
+0200
--- src/testdir/test14.in       2013-03-19 15:21:54.000000000 +0100
***************
*** 2,7 ****
--- 2,8 ----
  Also test ":s/pat/sub/" with different ~s in sub.
  Also test for ^Vxff and ^Vo123 in Insert mode.
  Also test "[m", "]m", "[M" and "]M"
+ Also test search()
  
  STARTTEST
  :so small.vim
***************
*** 34,39 ****
--- 35,50 ----
  2[MaJ :.w >>test.out
  k[MaK :.w >>test.out
  3[MaL :.w >>test.out
+ :"
+ /^foobar
+ :let startline = line('.')
+ :call search('foobar', 'c')
+ :call append(line('$'), line('.') - startline)
+ j:call search('^$', 'c')
+ :call append(line('$'), line('.') - startline)
+ :call search('^$', 'bc')
+ :call append(line('$'), line('.') - startline)
+ :/^search()/,$w >>test.out
  :qa!
  ENDTEST
  
***************
*** 64,66 ****
--- 75,82 ----
                }
        } e3
  }
+ 
+ foobar
+ 
+ 
+ search()
*** ../vim-7.3.870/src/testdir/test14.ok        2010-08-15 21:57:29.000000000 
+0200
--- src/testdir/test14.ok       2013-03-19 15:26:18.000000000 +0100
***************
*** 15,17 ****
--- 15,21 ----
        }JH e3
        }K e2
  {LF
+ search()
+ 0
+ 1
+ 1
*** ../vim-7.3.870/src/version.c        2013-03-19 14:48:25.000000000 +0100
--- src/version.c       2013-03-19 15:26:38.000000000 +0100
***************
*** 730,731 ****
--- 730,733 ----
  {   /* Add new patch number below this line */
+ /**/
+     871,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
75. You start wondering whether you could actually upgrade your brain
    with a Pentium Pro microprocessor 80.  The upgrade works just fine.

 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.


Raspunde prin e-mail lui