To: vim-dev@vim.org

Subject: patch 7.1.014

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=ISO-8859-1

Content-Transfer-Encoding: 8bit

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

Patch 7.1.014

Problem:    Crash when doing C indenting. (Chris Monson)

Solution:   Obtain the current line again after invoking cin_islabel().

Files:	    src/edit.c

*** ../vim-7.1.013/src/edit.c	Thu May 10 20:44:18 2007

--- src/edit.c	Wed Jun 20 18:25:54 2007

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

*** 7215,7220 ****

--- 7215,7222 ----

  		p = ml_get_curline();

  		if (cin_iscase(p) || cin_isscopedecl(p) || cin_islabel(30))

  		    return TRUE;

+ 		/* Need to get the line again after cin_islabel(). */

+ 		p = ml_get_curline();

  		if (curwin->w_cursor.col > 2

  			&& p[curwin->w_cursor.col - 1] == ':'

  			&& p[curwin->w_cursor.col - 2] == ':')

*** ../vim-7.1.013/src/version.c	Thu Jun 28 11:59:13 2007

--- src/version.c	Thu Jun 28 12:26:52 2007

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

*** 668,669 ****

--- 668,671 ----

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

+ /**/

+     14,

  /**/

-- 

Have you heard about the new Barbie doll?  It's called Divorce

Barbie.  It comes with all of Ken's stuff.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\

///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\

\\\        download, build and distribute -- http://www.A-A-P.org        ///

 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///