• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Revisión811f29447aea27adaf1f54879ddf0fbd05a1e094 (tree)
Tiempo2008-03-11 05:34:59
Autorvimboss
Commitervimboss

Log Message

updated for version 7.1-270

Cambiar Resumen

Diferencia incremental

diff -r 1c597397f006 -r 811f29447aea src/ex_docmd.c
--- a/src/ex_docmd.c Sun Mar 09 15:45:53 2008 +0000
+++ b/src/ex_docmd.c Mon Mar 10 20:34:59 2008 +0000
@@ -3932,8 +3932,7 @@
39323932 curwin->w_cursor.col = 0;
39333933 searchcmdlen = 0;
39343934 if (!do_search(NULL, c, cmd, 1L,
3935- SEARCH_HIS + SEARCH_MSG + SEARCH_START,
3936- NULL))
3935+ SEARCH_HIS | SEARCH_MSG, NULL))
39373936 {
39383937 curwin->w_cursor = pos;
39393938 cmd = NULL;
@@ -3980,8 +3979,7 @@
39803979 pos.col = 0;
39813980 if (searchit(curwin, curbuf, &pos,
39823981 *cmd == '?' ? BACKWARD : FORWARD,
3983- (char_u *)"", 1L,
3984- SEARCH_MSG + SEARCH_START,
3982+ (char_u *)"", 1L, SEARCH_MSG,
39853983 i, (linenr_T)0, NULL) != FAIL)
39863984 lnum = pos.lnum;
39873985 else
diff -r 1c597397f006 -r 811f29447aea src/search.c
--- a/src/search.c Sun Mar 09 15:45:53 2008 +0000
+++ b/src/search.c Mon Mar 10 20:34:59 2008 +0000
@@ -538,7 +538,10 @@
538538 return FAIL;
539539 }
540540
541- if (options & SEARCH_START)
541+ /* When not accepting a match at the start position set "extra_col" to a
542+ * non-zero value. Don't do that when starting at MAXCOL, since MAXCOL +
543+ * 1 is zero. */
544+ if ((options & SEARCH_START) || pos->col == MAXCOL)
542545 extra_col = 0;
543546 #ifdef FEAT_MBYTE
544547 /* Watch out for the "col" being MAXCOL - 2, used in a closed fold. */
diff -r 1c597397f006 -r 811f29447aea src/version.c
--- a/src/version.c Sun Mar 09 15:45:53 2008 +0000
+++ b/src/version.c Mon Mar 10 20:34:59 2008 +0000
@@ -667,6 +667,8 @@
667667 static int included_patches[] =
668668 { /* Add new patch number below this line */
669669 /**/
670+ 270,
671+/**/
670672 269,
671673 /**/
672674 268,
Show on old repository browser