To: vim_dev@googlegroups.com

Subject: Patch 7.4.338

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.338

Problem:    Cannot wrap lines taking indent into account.

Solution:   Add the 'breakindent' option. (many authors, final improvements by

	    Christian Brabandt)

Files:	    runtime/doc/eval.txt, runtime/doc/options.txt, runtime/optwin.vim,

	    src/buffer.c, src/charset.c, src/edit.c, src/ex_getln.c,

	    src/getchar.c, src/misc1.c, src/misc2.c, src/ops.c, src/option.c,

	    src/option.h, src/proto/charset.pro, src/proto/misc1.pro,

	    src/proto/option.pro, src/screen.c, src/structs.h,

	    src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,

	    src/testdir/Make_ming.mak, src/testdir/Make_os2.mak,

	    src/testdir/Make_vms.mms, src/testdir/Makefile,

	    src/testdir/test_breakindent.in, src/testdir/test_breakindent.ok,

	    src/ui.c

*** ../vim-7.4.337/runtime/doc/eval.txt	2014-06-17 17:48:21.768628007 +0200

--- runtime/doc/eval.txt	2014-06-25 12:57:00.986115765 +0200

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

*** 6639,6646 ****

  keymap			Compiled with 'keymap' support.

  langmap			Compiled with 'langmap' support.

  libcall			Compiled with |libcall()| support.

! linebreak		Compiled with 'linebreak', 'breakat' and 'showbreak'

! 			support.

  lispindent		Compiled with support for lisp indenting.

  listcmds		Compiled with commands for the buffer list |:files|

  			and the argument list |arglist|.

--- 6651,6658 ----

  keymap			Compiled with 'keymap' support.

  langmap			Compiled with 'langmap' support.

  libcall			Compiled with |libcall()| support.

! linebreak		Compiled with 'linebreak', 'breakat', 'showbreak' and

! 			'breakindent' support.

  lispindent		Compiled with support for lisp indenting.

  listcmds		Compiled with commands for the buffer list |:files|

  			and the argument list |arglist|.

*** ../vim-7.4.337/runtime/doc/options.txt	2014-06-17 17:48:21.768628007 +0200

--- runtime/doc/options.txt	2014-06-25 12:57:00.986115765 +0200

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

*** 1200,1205 ****

--- 1200,1237 ----

  	break if 'linebreak' is on.  Only works for ASCII and also for 8-bit

  	characters when 'encoding' is an 8-bit encoding.

+ 						*'breakindent'* *'bri'*

+ 'breakindent' 'bri'	boolean (default off)

+ 			local to window

+ 			{not in Vi}

+ 			{not available when compiled without the |+linebreak|

+ 			feature}

+ 	Every wrapped line will continue visually indented (same amount of

+ 	space as the beginning of that line), thus preserving horizontal blocks

+ 	of text.

+ 

+ 						*'breakindentopt'* *'briopt'*

+ 'breakindentopt' 'briopt' string (default empty)

+ 			local to window

+ 			{not in Vi}

+ 			{not available when compiled without the |+linebreak|

+ 			feature}

+ 	Settings for 'breakindent'. It can consist of the following optional

+ 	items and must be seperated by a comma:

+ 		min:{n}	    Minimum text width that will be kept after

+ 			    applying 'breakindent', even if the resulting

+ 			    text should normally be narrower. This prevents

+ 			    text indented almost to the right window border

+ 			    occupying lot of vertical space when broken.

+ 		shift:{n}   After applying 'breakindent', wrapped line

+ 			    beginning will be shift by given number of

+ 			    characters. It permits dynamic French paragraph

+ 			    indentation (negative) or emphasizing the line

+ 			    continuation (positive).

+ 		sbr	    Display the 'showbreak' value before applying the 

+ 			    additional indent.

+ 	The default value for min is 20 and shift is 0.

+ 

  						*'browsedir'* *'bsdir'*

  'browsedir' 'bsdir'	string	(default: "last")

  			global

*** ../vim-7.4.337/runtime/optwin.vim	2014-04-01 12:26:40.241157964 +0200

--- runtime/optwin.vim	2014-06-25 12:57:00.990115765 +0200

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

*** 324,329 ****

--- 324,335 ----

  call append("$", "linebreak\twrap long lines at a character in 'breakat'")

  call append("$", "\t(local to window)")

  call <SID>BinOptionL("lbr")

+ call append("$", "breakindent\tpreserve indentation in wrapped text")

+ call append("$", "\t(local to window)")

+ call <SID>BinOptionL("bri")

+ call append("$", "breakindentopt\tadjust breakindent behaviour")

+ call append("$", "\t(local to window)")

+ call <SID>OptionL("briopt")

  call append("$", "breakat\twhich characters might cause a line break")

  call <SID>OptionG("brk", &brk)

  call append("$", "showbreak\tstring to put before wrapped screen lines")

*** ../vim-7.4.337/src/charset.c	2014-03-23 15:12:29.911264336 +0100

--- src/charset.c	2014-06-25 13:23:05.842174966 +0200

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

*** 867,875 ****

      char_u	*s;

  {

      colnr_T	col = startcol;

      while (*s != NUL)

! 	col += lbr_chartabsize_adv(&s, col);

      return (int)col;

  }

--- 867,876 ----

      char_u	*s;

  {

      colnr_T	col = startcol;

+     char_u	*line = s; /* pointer to start of line, for breakindent */

      while (*s != NUL)

! 	col += lbr_chartabsize_adv(line, &s, col);

      return (int)col;

  }

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

*** 877,892 ****

   * Like linetabsize(), but for a given window instead of the current one.

   */

      int

! win_linetabsize(wp, p, len)

      win_T	*wp;

!     char_u	*p;

      colnr_T	len;

  {

      colnr_T	col = 0;

      char_u	*s;

!     for (s = p; *s != NUL && (len == MAXCOL || s < p + len); mb_ptr_adv(s))

! 	col += win_lbr_chartabsize(wp, s, col, NULL);

      return (int)col;

  }

--- 878,894 ----

   * Like linetabsize(), but for a given window instead of the current one.

   */

      int

! win_linetabsize(wp, line, len)

      win_T	*wp;

!     char_u	*line;

      colnr_T	len;

  {

      colnr_T	col = 0;

      char_u	*s;

!     for (s = line; *s != NUL && (len == MAXCOL || s < line + len);

! 								mb_ptr_adv(s))

! 	col += win_lbr_chartabsize(wp, line, s, col, NULL);

      return (int)col;

  }

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

*** 1021,1032 ****

   * like chartabsize(), but also check for line breaks on the screen

   */

      int

! lbr_chartabsize(s, col)

      unsigned char	*s;

      colnr_T		col;

  {

  #ifdef FEAT_LINEBREAK

!     if (!curwin->w_p_lbr && *p_sbr == NUL)

      {

  #endif

  #ifdef FEAT_MBYTE

--- 1023,1035 ----

   * like chartabsize(), but also check for line breaks on the screen

   */

      int

! lbr_chartabsize(line, s, col)

!     char_u		*line; /* start of the line */

      unsigned char	*s;

      colnr_T		col;

  {

  #ifdef FEAT_LINEBREAK

!     if (!curwin->w_p_lbr && *p_sbr == NUL && !curwin->w_p_bri)

      {

  #endif

  #ifdef FEAT_MBYTE

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

*** 1036,1042 ****

  	RET_WIN_BUF_CHARTABSIZE(curwin, curbuf, s, col)

  #ifdef FEAT_LINEBREAK

      }

!     return win_lbr_chartabsize(curwin, s, col, NULL);

  #endif

  }

--- 1039,1045 ----

  	RET_WIN_BUF_CHARTABSIZE(curwin, curbuf, s, col)

  #ifdef FEAT_LINEBREAK

      }

!     return win_lbr_chartabsize(curwin, line == NULL ? s : line, s, col, NULL);

  #endif

  }

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

*** 1044,1056 ****

   * Call lbr_chartabsize() and advance the pointer.

   */

      int

! lbr_chartabsize_adv(s, col)

      char_u	**s;

      colnr_T	col;

  {

      int		retval;

!     retval = lbr_chartabsize(*s, col);

      mb_ptr_adv(*s);

      return retval;

  }

--- 1047,1060 ----

   * Call lbr_chartabsize() and advance the pointer.

   */

      int

! lbr_chartabsize_adv(line, s, col)

!     char_u	*line; /* start of the line */

      char_u	**s;

      colnr_T	col;

  {

      int		retval;

!     retval = lbr_chartabsize(line, *s, col);

      mb_ptr_adv(*s);

      return retval;

  }

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

*** 1063,1070 ****

   * value, init to 0 before calling.

   */

      int

! win_lbr_chartabsize(wp, s, col, headp)

      win_T	*wp;

      char_u	*s;

      colnr_T	col;

      int		*headp UNUSED;

--- 1067,1075 ----

   * value, init to 0 before calling.

   */

      int

! win_lbr_chartabsize(wp, line, s, col, headp)

      win_T	*wp;

+     char_u	*line; /* start of the line */

      char_u	*s;

      colnr_T	col;

      int		*headp UNUSED;

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

*** 1086,1094 ****

      int		n;

      /*

!      * No 'linebreak' and 'showbreak': return quickly.

       */

!     if (!wp->w_p_lbr && *p_sbr == NUL)

  #endif

      {

  #ifdef FEAT_MBYTE

--- 1091,1099 ----

      int		n;

      /*

!      * No 'linebreak', 'showbreak' and 'breakindent': return quickly.

       */

!     if (!wp->w_p_lbr && !wp->w_p_bri && *p_sbr == NUL)

  #endif

      {

  #ifdef FEAT_MBYTE

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

*** 1163,1173 ****

  # endif

      /*

!      * May have to add something for 'showbreak' string at start of line

       * Set *headp to the size of what we add.

       */

      added = 0;

!     if (*p_sbr != NUL && wp->w_p_wrap && col != 0)

      {

  	numberextra = win_col_off(wp);

  	col += numberextra + mb_added;

--- 1168,1179 ----

  # endif

      /*

!      * May have to add something for 'breakindent' and/or 'showbreak'

!      * string at start of line.

       * Set *headp to the size of what we add.

       */

      added = 0;

!     if ((*p_sbr != NUL || wp->w_p_bri) && wp->w_p_wrap && col != 0)

      {

  	numberextra = win_col_off(wp);

  	col += numberextra + mb_added;

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

*** 1180,1186 ****

  	}

  	if (col == 0 || col + size > (colnr_T)W_WIDTH(wp))

  	{

! 	    added = vim_strsize(p_sbr);

  	    if (tab_corr)

  		size += (added / wp->w_buffer->b_p_ts) * wp->w_buffer->b_p_ts;

  	    else

--- 1186,1197 ----

  	}

  	if (col == 0 || col + size > (colnr_T)W_WIDTH(wp))

  	{

! 	    added = 0;

! 	    if (*p_sbr != NUL)

! 		added += vim_strsize(p_sbr);

! 	    if (wp->w_p_bri)

! 		added += get_breakindent_win(wp, line);

! 

  	    if (tab_corr)

  		size += (added / wp->w_buffer->b_p_ts) * wp->w_buffer->b_p_ts;

  	    else

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

*** 1274,1286 ****

      colnr_T	vcol;

      char_u	*ptr;		/* points to current char */

      char_u	*posptr;	/* points to char at pos->col */

      int		incr;

      int		head;

      int		ts = wp->w_buffer->b_p_ts;

      int		c;

      vcol = 0;

!     ptr = ml_get_buf(wp->w_buffer, pos->lnum, FALSE);

      if (pos->col == MAXCOL)

  	posptr = NULL;  /* continue until the NUL */

      else

--- 1285,1298 ----

      colnr_T	vcol;

      char_u	*ptr;		/* points to current char */

      char_u	*posptr;	/* points to char at pos->col */

+     char_u	*line;		/* start of the line */

      int		incr;

      int		head;

      int		ts = wp->w_buffer->b_p_ts;

      int		c;

      vcol = 0;

!     line = ptr = ml_get_buf(wp->w_buffer, pos->lnum, FALSE);

      if (pos->col == MAXCOL)

  	posptr = NULL;  /* continue until the NUL */

      else

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

*** 1288,1299 ****

      /*

       * This function is used very often, do some speed optimizations.

!      * When 'list', 'linebreak' and 'showbreak' are not set use a simple loop.

       * Also use this when 'list' is set but tabs take their normal size.

       */

      if ((!wp->w_p_list || lcs_tab1 != NUL)

  #ifdef FEAT_LINEBREAK

! 	    && !wp->w_p_lbr && *p_sbr == NUL

  #endif

         )

      {

--- 1300,1312 ----

      /*

       * This function is used very often, do some speed optimizations.

!      * When 'list', 'linebreak', 'showbreak' and 'breakindent' are not set

!      * use a simple loop.

       * Also use this when 'list' is set but tabs take their normal size.

       */

      if ((!wp->w_p_list || lcs_tab1 != NUL)

  #ifdef FEAT_LINEBREAK

! 	    && !wp->w_p_lbr && *p_sbr == NUL && !wp->w_p_bri

  #endif

         )

      {

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

*** 1355,1361 ****

  	{

  	    /* A tab gets expanded, depending on the current column */

  	    head = 0;

! 	    incr = win_lbr_chartabsize(wp, ptr, vcol, &head;;

  	    /* make sure we don't go past the end of the line */

  	    if (*ptr == NUL)

  	    {

--- 1368,1374 ----

  	{

  	    /* A tab gets expanded, depending on the current column */

  	    head = 0;

! 	    incr = win_lbr_chartabsize(wp, line, ptr, vcol, &head;;

  	    /* make sure we don't go past the end of the line */

  	    if (*ptr == NUL)

  	    {

*** ../vim-7.4.337/src/edit.c	2014-05-28 21:40:47.092329130 +0200

--- src/edit.c	2014-06-25 13:16:43.278160493 +0200

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

*** 1956,1962 ****

  	    else

  #endif

  		++new_cursor_col;

! 	    vcol += lbr_chartabsize(ptr + new_cursor_col, (colnr_T)vcol);

  	}

  	vcol = last_vcol;

--- 1956,1962 ----

  	    else

  #endif

  		++new_cursor_col;

! 	    vcol += lbr_chartabsize(ptr, ptr + new_cursor_col, (colnr_T)vcol);

  	}

  	vcol = last_vcol;

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

*** 7126,7134 ****

  	for (;;)

  	{

  	    coladvance(v - width);

! 	    /* getviscol() is slow, skip it when 'showbreak' is empty and

! 	     * there are no multi-byte characters */

! 	    if ((*p_sbr == NUL

  #  ifdef FEAT_MBYTE

  			&& !has_mbyte

  #  endif

--- 7126,7135 ----

  	for (;;)

  	{

  	    coladvance(v - width);

! 	    /* getviscol() is slow, skip it when 'showbreak' is empty,

! 	     * 'breakindent' is not set and there are no multi-byte

! 	     * characters */

! 	    if ((*p_sbr == NUL && !curwin->w_p_bri

  #  ifdef FEAT_MBYTE

  			&& !has_mbyte

  #  endif

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

*** 9758,9768 ****

  	getvcol(curwin, &fpos, &vcol, NULL, NULL);

  	getvcol(curwin, cursor, &want_vcol, NULL, NULL);

! 	/* Use as many TABs as possible.  Beware of 'showbreak' and

! 	 * 'linebreak' adding extra virtual columns. */

  	while (vim_iswhite(*ptr))

  	{

! 	    i = lbr_chartabsize((char_u *)"\t", vcol);

  	    if (vcol + i > want_vcol)

  		break;

  	    if (*ptr != TAB)

--- 9759,9769 ----

  	getvcol(curwin, &fpos, &vcol, NULL, NULL);

  	getvcol(curwin, cursor, &want_vcol, NULL, NULL);

! 	/* Use as many TABs as possible.  Beware of 'breakindent', 'showbreak'

! 	 * and 'linebreak' adding extra virtual columns. */

  	while (vim_iswhite(*ptr))

  	{

! 	    i = lbr_chartabsize(NULL, (char_u *)"\t", vcol);

  	    if (vcol + i > want_vcol)

  		break;

  	    if (*ptr != TAB)

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

*** 9784,9794 ****

  	if (change_col >= 0)

  	{

  	    int repl_off = 0;

  	    /* Skip over the spaces we need. */

  	    while (vcol < want_vcol && *ptr == ' ')

  	    {

! 		vcol += lbr_chartabsize(ptr, vcol);

  		++ptr;

  		++repl_off;

  	    }

--- 9785,9796 ----

  	if (change_col >= 0)

  	{

  	    int repl_off = 0;

+ 	    char_u *line = ptr;

  	    /* Skip over the spaces we need. */

  	    while (vcol < want_vcol && *ptr == ' ')

  	    {

! 		vcol += lbr_chartabsize(line, ptr, vcol);

  		++ptr;

  		++repl_off;

  	    }

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

*** 10029,10034 ****

--- 10031,10037 ----

      int	    c;

      int	    temp;

      char_u  *ptr, *prev_ptr;

+     char_u  *line;

      if (lnum < 1 || lnum > curbuf->b_ml.ml_line_count)

      {

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

*** 10038,10050 ****

      /* try to advance to the cursor column */

      temp = 0;

!     ptr = ml_get(lnum);

      prev_ptr = ptr;

      validate_virtcol();

      while ((colnr_T)temp < curwin->w_virtcol && *ptr != NUL)

      {

  	prev_ptr = ptr;

! 	temp += lbr_chartabsize_adv(&ptr, (colnr_T)temp);

      }

      if ((colnr_T)temp > curwin->w_virtcol)

  	ptr = prev_ptr;

--- 10041,10053 ----

      /* try to advance to the cursor column */

      temp = 0;

!     line = ptr = ml_get(lnum);

      prev_ptr = ptr;

      validate_virtcol();

      while ((colnr_T)temp < curwin->w_virtcol && *ptr != NUL)

      {

  	prev_ptr = ptr;

! 	temp += lbr_chartabsize_adv(line, &ptr, (colnr_T)temp);

      }

      if ((colnr_T)temp > curwin->w_virtcol)

  	ptr = prev_ptr;

*** ../vim-7.4.337/src/ex_getln.c	2014-06-25 12:26:42.230046959 +0200

--- src/ex_getln.c	2014-06-25 12:57:00.998115765 +0200

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

*** 2302,2311 ****

  		p = (char_u *)line_ga.ga_data;

  		p[line_ga.ga_len] = NUL;

! 		indent = get_indent_str(p, 8);

  		indent += sw - indent % sw;

  add_indent:

! 		while (get_indent_str(p, 8) < indent)

  		{

  		    char_u *s = skipwhite(p);

--- 2302,2311 ----

  		p = (char_u *)line_ga.ga_data;

  		p[line_ga.ga_len] = NUL;

! 		indent = get_indent_str(p, 8, FALSE);

  		indent += sw - indent % sw;

  add_indent:

! 		while (get_indent_str(p, 8, FALSE) < indent)

  		{

  		    char_u *s = skipwhite(p);

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

*** 2357,2367 ****

  		else

  		{

  		    p[line_ga.ga_len] = NUL;

! 		    indent = get_indent_str(p, 8);

  		    --indent;

  		    indent -= indent % get_sw_value(curbuf);

  		}

! 		while (get_indent_str(p, 8) > indent)

  		{

  		    char_u *s = skipwhite(p);

--- 2357,2367 ----

  		else

  		{

  		    p[line_ga.ga_len] = NUL;

! 		    indent = get_indent_str(p, 8, FALSE);

  		    --indent;

  		    indent -= indent % get_sw_value(curbuf);

  		}

! 		while (get_indent_str(p, 8, FALSE) > indent)

  		{

  		    char_u *s = skipwhite(p);

*** ../vim-7.4.337/src/getchar.c	2014-05-22 18:59:54.510169240 +0200

--- src/getchar.c	2014-06-25 13:16:53.946160896 +0200

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

*** 2675,2681 ****

  				{

  				    if (!vim_iswhite(ptr[col]))

  					curwin->w_wcol = vcol;

! 				    vcol += lbr_chartabsize(ptr + col,

  							       (colnr_T)vcol);

  #ifdef FEAT_MBYTE

  				    if (has_mbyte)

--- 2675,2681 ----

  				{

  				    if (!vim_iswhite(ptr[col]))

  					curwin->w_wcol = vcol;

! 				    vcol += lbr_chartabsize(ptr, ptr + col,

  							       (colnr_T)vcol);

  #ifdef FEAT_MBYTE

  				    if (has_mbyte)

*** ../vim-7.4.337/src/misc1.c	2014-05-22 14:00:12.698534712 +0200

--- src/misc1.c	2014-06-25 13:39:43.598212712 +0200

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

*** 32,38 ****

      int

  get_indent()

  {

!     return get_indent_str(ml_get_curline(), (int)curbuf->b_p_ts);

  }

  /*

--- 32,38 ----

      int

  get_indent()

  {

!     return get_indent_str(ml_get_curline(), (int)curbuf->b_p_ts, FALSE);

  }

  /*

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

*** 42,48 ****

  get_indent_lnum(lnum)

      linenr_T	lnum;

  {

!     return get_indent_str(ml_get(lnum), (int)curbuf->b_p_ts);

  }

  #if defined(FEAT_FOLDING) || defined(PROTO)

--- 42,48 ----

  get_indent_lnum(lnum)

      linenr_T	lnum;

  {

!     return get_indent_str(ml_get(lnum), (int)curbuf->b_p_ts, FALSE);

  }

  #if defined(FEAT_FOLDING) || defined(PROTO)

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

*** 55,61 ****

      buf_T	*buf;

      linenr_T	lnum;

  {

!     return get_indent_str(ml_get_buf(buf, lnum, FALSE), (int)buf->b_p_ts);

  }

  #endif

--- 55,61 ----

      buf_T	*buf;

      linenr_T	lnum;

  {

!     return get_indent_str(ml_get_buf(buf, lnum, FALSE), (int)buf->b_p_ts, FALSE);

  }

  #endif

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

*** 64,79 ****

   * 'tabstop' at "ts"

   */

      int

! get_indent_str(ptr, ts)

      char_u	*ptr;

      int		ts;

  {

      int		count = 0;

      for ( ; *ptr; ++ptr)

      {

! 	if (*ptr == TAB)    /* count a tab for what it is worth */

! 	    count += ts - (count % ts);

  	else if (*ptr == ' ')

  	    ++count;		/* count a space for one */

  	else

--- 64,86 ----

   * 'tabstop' at "ts"

   */

      int

! get_indent_str(ptr, ts, list)

      char_u	*ptr;

      int		ts;

+     int		list; /* if TRUE, count only screen size for tabs */

  {

      int		count = 0;

      for ( ; *ptr; ++ptr)

      {

! 	if (*ptr == TAB)

! 	{

! 	    if (!list || lcs_tab1)    /* count a tab for what it is worth */

! 		count += ts - (count % ts);

! 	    else

! 	/* in list mode, when tab is not set, count screen char width for Tab: ^I */

! 		count += ptr2cells(ptr);

! 	}

  	else if (*ptr == ' ')

  	    ++count;		/* count a space for one */

  	else

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

*** 476,481 ****

--- 483,540 ----

      return (int)col;

  }

+ #if defined(FEAT_LINEBREAK) || defined(PROTO)

+ /*

+  * Return appropriate space number for breakindent, taking influencing

+  * parameters into account. Window must be specified, since it is not

+  * necessarily always the current one.

+  */

+     int

+ get_breakindent_win(wp, line)

+     win_T	*wp;

+     char_u	*line; /* start of the line */

+ {

+     static int	    prev_indent = 0;  /* cached indent value */

+     static long	    prev_ts     = 0L; /* cached tabstop value */