To: vim_dev@googlegroups.com

Subject: Patch 7.4.027

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.4.027 (after 7.4.025)

Problem:    Another valgrind error when using CTRL-X CTRL-F at the start of

	    the line. (Dominique Pelle)

Solution:   Don't call mb_ptr_back() at the start of the line.  Add a test.

Files:	    src/edit.c, src/testdir/test32.in

*** ../vim-7.4.026/src/edit.c	2013-09-08 16:03:40.000000000 +0200

--- src/edit.c	2013-09-08 18:18:32.000000000 +0200

***************

*** 5183,5197 ****

  	}

  	else if (ctrl_x_mode == CTRL_X_FILES)

  	{

- 	    char_u	*p = line + startcol;

- 

  	    /* Go back to just before the first filename character. */

! 	    mb_ptr_back(line, p);

! 	    while (p > line && vim_isfilec(PTR2CHAR(p)))

  		mb_ptr_back(line, p);

! 	    startcol = (int)(p - line) + 1;

! 	    if (p == line && vim_isfilec(PTR2CHAR(p)))

! 		startcol = 0;

  	    compl_col += startcol;

  	    compl_length = (int)curs_col - startcol;

--- 5183,5201 ----

  	}

  	else if (ctrl_x_mode == CTRL_X_FILES)

  	{

  	    /* Go back to just before the first filename character. */

! 	    if (startcol > 0)

! 	    {

! 		char_u	*p = line + startcol;

! 

  		mb_ptr_back(line, p);

! 		while (p > line && vim_isfilec(PTR2CHAR(p)))

! 		    mb_ptr_back(line, p);

! 		if (p == line && vim_isfilec(PTR2CHAR(p)))

! 		    startcol = 0;

! 		else

! 		    startcol = (int)(p - line) + 1;

! 	    }

  	    compl_col += startcol;

  	    compl_length = (int)curs_col - startcol;

*** ../vim-7.4.026/src/testdir/test32.in	2010-05-15 13:04:10.000000000 +0200

--- src/testdir/test32.in	2013-09-08 18:08:07.000000000 +0200

***************

*** 36,41 ****

--- 36,44 ----

  :w Xtest11.one

  :w Xtest11.two

  O??IX?A????

+ :" use CTRL-X CTRL-F to complete Xtest11.one, remove it and then use

+ :" CTRL-X CTRL-F again to verify this doesn't cause trouble.

+ OX?????????????ddk

  :se cpt=w

  OST??????

  :se cpt=u nohid

*** ../vim-7.4.026/src/version.c	2013-09-08 16:07:03.000000000 +0200

--- src/version.c	2013-09-08 18:14:17.000000000 +0200

***************

*** 740,741 ****

--- 740,743 ----

  {   /* Add new patch number below this line */

+ /**/

+     27,

  /**/

-- 

hundred-and-one symptoms of being an internet addict:

190. You quickly hand over your wallet, leather jacket, and car keys

     during a mugging, then proceed to beat the crap out of your

     assailant when he asks for your laptop.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- 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    ///