Repository:

https://github.com/chrisbra/vim-mq-patches

git://github.com/chrisbra/vim-mq-patches.git

Filename:

var_tabstops

Latest update for:

vim-7.4.796

Bug reports:

http://www.vim.org/maillist.php

License & Copyright:

© 2008 Matthew Winn

─────────────────────────────────────────────────────────────────────────────

Christian Brabandt 20150725

- fix offsets, fix compiler warnings (option not correctly initialized)

Christian Brabandt 20150609

- updated offsets and have the tests apply cleanly

Christian Brabandt 20141102:

- correctly cache vts values when calculating the breakindent

Christian Brabandt 20141030

[DONE] TODO: test_breakindent.out breaks, if instead of using 'ts' setting 'vts' setting is used.

[DONE] TODO: get_breakindent_win should use vts value

[DONE] TODO: get_indent_str_vtab should also use the true/false variable for checking screen size of a tab!

Roland Eggner 2014-10-23  vim-7.4.488

Fixed insertion of 4 lines after src/option.c:5439 -- due to context change in

vim-7.4.456, “hg qrefresh” inserted erroneously with fuzz 2 and -111 lines offset.

Fixed rejections of  src/testdir/Make{_{{amiga,dos,ming,os2}.mak,vms.mms},file} .

Roland Eggner 2014-09-09  vim-7.4.430

Readded  src/testdir/test_vartabs.{in,ok}  based on an older version of this patch.

Fixed rejections of  src/testdir/Make{_{{amiga,dos,ming,os2}.mak,vms.mms},file} .

diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt

index e2148b3..8ac07bd 100644

--- a/runtime/doc/change.txt

+++ b/runtime/doc/change.txt

@@ -984,6 +984,11 @@ This replaces each 'E' character with a euro sign.  Read more in |<Char->|.

 			this (that's a good habit anyway).

 			`:retab!` may also change a sequence of spaces by

 			<Tab> characters, which can mess up a printf().

+			If the |+vartabs| feature is enabled then a list of

+			tab widths separated by commas may be used in place of

+			a single tabstop.  Each value in the list represents

+			the width of one tabstop, except the final value which

+			applies to all following tabstops.

 			{not in Vi}

 							*retab-example*

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt

index 30ea88d..80f658c 100644

--- a/runtime/doc/options.txt

+++ b/runtime/doc/options.txt

@@ -6853,6 +6853,10 @@ A jump table for the options with a short description can be found at |Q_op|.

 	set.

 	NOTE: This option is set to 0 when 'compatible' is set.

+	If Vim is compiled with the |+vartabs| feature then the value of

+	'softtabstop' will be ignored if |'varsofttabstop'| is set to

+	anything other than an empty string.

+

 						*'spell'* *'nospell'*

 'spell'			boolean	(default off)

 			local to window

@@ -7402,6 +7406,10 @@ A jump table for the options with a short description can be found at |Q_op|.

 	   though.  Otherwise aligned comments will be wrong when 'tabstop' is

 	   changed.

+	If Vim is compiled with the |+vartabs| feature then the value of

+	'tabstop' will be ignored if |'vartabstop'| is set to anything other

+	than an empty string.

+

 			*'tagbsearch'* *'tbs'* *'notagbsearch'* *'notbs'*

 'tagbsearch' 'tbs'	boolean	(default on)

 			global

@@ -8086,6 +8094,44 @@ A jump table for the options with a short description can be found at |Q_op|.

 	written to disk (see |crash-recovery|).  Also used for the

 	|CursorHold| autocommand event.

+					*'varsofttabstop'* *'vsts'*

+'varsofttabstop' 'vsts'	string	(default "")

+			local to buffer

+			{only available when compiled with the |+vartabs|

+			feature}

+			{not in Vi}

+	A list of the number of spaces that a <Tab> counts for while editing,

+	such as inserting a <Tab> or using <BS>.  It "feels" like variable-

+	width <Tab>s are being inserted, while in fact a mixture of spaces

+	and <Tab>s is used.  Tab widths are separated with commas, with the

+	final value applying to all subsequent tabs.

+

+	For example, when editing assembly language files where statements

+	start in the 8th column and comments in the 40th, it may be useful

+	to use the following: >

+		:set varsofttabstop=8,32,8

+<	This will set soft tabstops at the 8th and 40th columns, and at every

+	8th column thereafter.

+

+	Note that the value of |'softtabstop'| will be ignored while

+	'varsofttabstop' is set.

+

+						*'vartabstop'* *'vts'*

+'vartabstop' 'vts'	string	(default "")

+			local to buffer

+			{only available when compiled with the |+vartabs|

+			feature}

+			{not in Vi}

+	A list of the number of spaces that a <Tab> in the file counts for,

+	separated by commas.  Each value corresponds to one tab, with the

+	final value applying to all subsequent tabs. For example: >

+		:set vartabstop=4,20,10,8

+<	This will make the first tab 4 spaces wide, the second 20 spaces,

+	the third 10 spaces, and all following tabs 8 spaces.

+

+	Note that the value of |'tabstop'| will be ignored while 'vartabstop'

+	is set.

+

 						*'verbose'* *'vbs'*

 'verbose' 'vbs'		number	(default 0)

 			global

diff --git a/runtime/doc/tags b/runtime/doc/tags

index 7eaf6a0..1e068b3 100644

--- a/runtime/doc/tags

+++ b/runtime/doc/tags

@@ -1105,6 +1105,8 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*

 'updatetime'	options.txt	/*'updatetime'*

 'ur'	options.txt	/*'ur'*

 'ut'	options.txt	/*'ut'*

+'varsofttabstop'	options.txt	/*'varsofttabstop'*

+'vartabstop'	options.txt	/*'vartabstop'*

 'vb'	options.txt	/*'vb'*

 'vbs'	options.txt	/*'vbs'*

 'vdir'	options.txt	/*'vdir'*

@@ -1119,6 +1121,8 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*

 'virtualedit'	options.txt	/*'virtualedit'*

 'visualbell'	options.txt	/*'visualbell'*

 'vop'	options.txt	/*'vop'*

+'vsts'	options.txt	/*'vsts'*

+'vts'	options.txt	/*'vts'*

 'w1200'	vi_diff.txt	/*'w1200'*

 'w300'	vi_diff.txt	/*'w300'*

 'w9600'	vi_diff.txt	/*'w9600'*

@@ -1308,6 +1312,7 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*

 +title	various.txt	/*+title*

 +toolbar	various.txt	/*+toolbar*

 +user_commands	various.txt	/*+user_commands*

++vartabs	various.txt	/*+vartabs*

 +vertsplit	various.txt	/*+vertsplit*

 +viminfo	various.txt	/*+viminfo*

 +virtualedit	various.txt	/*+virtualedit*

diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt

index 729fff5..2f68370 100644

--- a/runtime/doc/various.txt

+++ b/runtime/doc/various.txt

@@ -436,6 +436,7 @@ N  *+timers*		the |timer_start()| function

 N  *+title*		Setting the window 'title' and 'icon'

 N  *+toolbar*		|gui-toolbar|

 N  *+user_commands*	User-defined commands. |user-commands|

+B  *+vartabs*		Variable-width tabstops. |'vartabstop'|

 N  *+viminfo*		|'viminfo'|

 N  *+vertsplit*		Vertically split windows |:vsplit|

 N  *+virtualedit*	|'virtualedit'|

diff --git a/runtime/optwin.vim b/runtime/optwin.vim

index d759c04..ae59692 100644

--- a/runtime/optwin.vim

+++ b/runtime/optwin.vim

@@ -833,6 +833,14 @@ call <SID>OptionL("ts")

 call append("$", "shiftwidth\tnumber of spaces used for each step of (auto)indent")

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

 call <SID>OptionL("sw")

+if has("vartabs")

+  call append("$", "vartabstop\tlist of number of spaces a tab counts for")

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

+  call <SID>OptionL("vts")

+  call append("$", "varsofttabstop\tlist of number of spaces a soft tabsstop counts for")

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

+  call <SID>OptionL("vsts")

+endif

 call append("$", "smarttab\ta <Tab> in an indent inserts 'shiftwidth' spaces")

 call <SID>BinOptionG("sta", &sta)

 call append("$", "softtabstop\tif non-zero, number of spaces to insert for a <Tab>")

diff --git a/src/buffer.c b/src/buffer.c

index b013295..94bcb70 100644

--- a/src/buffer.c

+++ b/src/buffer.c

@@ -2160,6 +2160,19 @@ free_buf_options(

     clear_string_option(&buf->b_p_fo);

     clear_string_option(&buf->b_p_flp);

     clear_string_option(&buf->b_p_isk);

+#ifdef FEAT_VARTABS

+    clear_string_option(&buf->b_p_vsts);

+    if (buf->b_p_vsts_nopaste)

+	vim_free(buf->b_p_vsts_nopaste);

+    buf->b_p_vsts_nopaste = 0;

+    if (buf->b_p_vsts_ary)

+	vim_free(buf->b_p_vsts_ary);

+    buf->b_p_vsts_ary = 0;

+    clear_string_option(&buf->b_p_vts);

+    if (buf->b_p_vts_ary)

+	vim_free(buf->b_p_vts_ary);

+    buf->b_p_vts_ary = 0;

+#endif

 #ifdef FEAT_KEYMAP

     clear_string_option(&buf->b_p_keymap);

     ga_clear(&buf->b_kmap_ga);

diff --git a/src/charset.c b/src/charset.c

index 134cd09..ed1f526 100644

--- a/src/charset.c

+++ b/src/charset.c

@@ -812,6 +812,15 @@ vim_strnsize(char_u *s, int len)

  * Also see getvcol() below.

  */

+#ifdef FEAT_VARTABS

+#define RET_WIN_BUF_CHARTABSIZE(wp, buf, p, col) \

+    if (*(p) == TAB && (!(wp)->w_p_list || lcs_tab1)) \

+    { \

+	return tabstop_padding(col, (buf)->b_p_ts, (buf)->b_p_vts_ary); \

+    } \

+    else \

+	return ptr2cells(p);

+#else

 #define RET_WIN_BUF_CHARTABSIZE(wp, buf, p, col) \

     if (*(p) == TAB && (!(wp)->w_p_list || lcs_tab1)) \

     { \

@@ -821,6 +830,7 @@ vim_strnsize(char_u *s, int len)

     } \

     else \

 	return ptr2cells(p);

+#endif

     int

 chartabsize(char_u *p, colnr_T col)

@@ -1225,8 +1235,13 @@ win_nolbr_chartabsize(

     if (*s == TAB && (!wp->w_p_list || lcs_tab1))

     {

+# ifdef FEAT_VARTABS

+	return tabstop_padding(col, wp->w_buffer->b_p_ts,

+				    wp->w_buffer->b_p_vts_ary);

+# else

 	n = wp->w_buffer->b_p_ts;

 	return (int)(n - (col % n));

+# endif

     }

     n = ptr2cells(s);

     /* Add one cell for a double-width character in the last column of the

@@ -1288,6 +1303,9 @@ getvcol(

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

     int		incr;

     int		head;

+#ifdef FEAT_VARTABS

+    int		*vts = wp->w_buffer->b_p_vts_ary;

+#endif

     int		ts = wp->w_buffer->b_p_ts;

     int		c;

@@ -1327,7 +1345,11 @@ getvcol(

 	    }

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

 	    if (c == TAB)

+#ifdef FEAT_VARTABS

+		incr = tabstop_padding(vcol, ts, vts);

+#else

 		incr = ts - (vcol % ts);

+#endif

 	    else

 	    {

 #ifdef FEAT_MBYTE

diff --git a/src/edit.c b/src/edit.c

index a87c155..2d2c89a 100644

--- a/src/edit.c

+++ b/src/edit.c

@@ -716,7 +716,13 @@ edit(

 	    mincol = curwin->w_wcol;

 	    validate_cursor_col();

-	    if ((int)curwin->w_wcol < mincol - curbuf->b_p_ts

+	    if (

+#ifdef FEAT_VARTABS

+		(int)curwin->w_wcol < mincol

+		    - tabstop_at(get_nolist_virtcol(), curbuf->b_p_ts, curbuf->b_p_vts_ary)

+#else

+		(int)curwin->w_wcol < mincol - curbuf->b_p_ts

+#endif

 		    && curwin->w_wrow == W_WINROW(curwin)

 						 + curwin->w_height - 1 - p_so

 		    && (curwin->w_cursor.lnum != curwin->w_topline

@@ -9078,23 +9084,31 @@ ins_bs(

 	 */

 	if (	   mode == BACKSPACE_CHAR

 		&& ((p_sta && in_indent)

-		    || (get_sts_value() != 0

+		    || ((get_sts_value() != 0

+#ifdef FEAT_VARTABS

+			|| tabstop_count(curbuf->b_p_vsts_ary)

+#endif

+			)

 			&& curwin->w_cursor.col > 0

 			&& (*(ml_get_cursor() - 1) == TAB

 			    || (*(ml_get_cursor() - 1) == ' '

 				&& (!*inserted_space_p

 				    || arrow_used))))))

 	{

+#ifndef FEAT_VARTABS

 	    int		ts;

+#endif

 	    colnr_T	vcol;

 	    colnr_T	want_vcol;

 	    colnr_T	start_vcol;

 	    *inserted_space_p = FALSE;

+#ifndef FEAT_VARTABS

 	    if (p_sta && in_indent)

 		ts = (int)get_sw_value(curbuf);

 	    else

 		ts = (int)get_sts_value();

+#endif

 	    /* Compute the virtual column where we want to be.  Since

 	     * 'showbreak' may get in the way, need to get the last column of

 	     * the previous character. */

@@ -9103,7 +9117,15 @@ ins_bs(

 	    dec_cursor();

 	    getvcol(curwin, &curwin->w_cursor, NULL, NULL, &want_vcol);

 	    inc_cursor();

+#ifdef FEAT_VARTABS

+	    if (p_sta && in_indent)

+		want_vcol = (want_vcol / curbuf->b_p_sw) * curbuf->b_p_sw;

+	    else

+		want_vcol = tabstop_start(want_vcol, curbuf->b_p_sts,

+						     curbuf->b_p_vsts_ary);

+#else

 	    want_vcol = (want_vcol / ts) * ts;

+#endif

 	    /* delete characters until we are at or before want_vcol */

 	    while (vcol > want_vcol

@@ -9809,7 +9831,18 @@ ins_tab(void)

      * When nothing special, insert TAB like a normal character

      */

     if (!curbuf->b_p_et

+#ifdef FEAT_VARTABS

+	    && !(p_sta && ind

+		/* These five lines mean 'tabstop' != 'shiftwidth' */

+		&& ((tabstop_count(curbuf->b_p_vts_ary) > 1)

+		    || (tabstop_count(curbuf->b_p_vts_ary) == 1

+		        && tabstop_first(curbuf->b_p_vts_ary) != get_sw_value(curbuf))

+	            || (tabstop_count(curbuf->b_p_vts_ary) == 0

+		        && curbuf->b_p_ts != get_sw_value(curbuf))))

+	    && tabstop_count(curbuf->b_p_vsts_ary) == 0

+#else

 	    && !(p_sta && ind && curbuf->b_p_ts != get_sw_value(curbuf))

+#endif

 	    && get_sts_value() == 0)

 	return TRUE;

@@ -9824,6 +9857,20 @@ ins_tab(void)

 #endif

     AppendToRedobuff((char_u *)"\t");

+#ifdef FEAT_VARTABS

+    if (p_sta && ind)		/* insert tab in indent, use 'shiftwidth' */

+    {

+	temp = (int)curbuf->b_p_sw;

+	temp -= get_nolist_virtcol() % temp;

+    }

+    else if (tabstop_count(curbuf->b_p_vsts_ary) > 0 || curbuf->b_p_sts > 0)

+	                        /* use 'softtabstop' when set */

+	temp = tabstop_padding(get_nolist_virtcol(), curbuf->b_p_sts,

+						     curbuf->b_p_vsts_ary);

+    else			/* otherwise use 'tabstop' */

+	temp = tabstop_padding(get_nolist_virtcol(), curbuf->b_p_ts,

+						     curbuf->b_p_vts_ary);

+#else

     if (p_sta && ind)		/* insert tab in indent, use 'shiftwidth' */

 	temp = (int)get_sw_value(curbuf);

     else if (curbuf->b_p_sts != 0) /* use 'softtabstop' when set */

@@ -9831,6 +9878,7 @@ ins_tab(void)

     else			/* otherwise use 'tabstop' */

 	temp = (int)curbuf->b_p_ts;

     temp -= get_nolist_virtcol() % temp;

+#endif

     /*

      * Insert the first space with ins_char().	It will delete one char in

@@ -9855,7 +9903,13 @@ ins_tab(void)

     /*

      * When 'expandtab' not set: Replace spaces by TABs where possible.

      */

+#ifdef FEAT_VARTABS

+    if (!curbuf->b_p_et && (tabstop_count(curbuf->b_p_vsts_ary) > 0

+                            || get_sts_value() > 0

+			    || (p_sta && ind)))

+#else

     if (!curbuf->b_p_et && (get_sts_value() || (p_sta && ind)))

+#endif

     {

 	char_u		*ptr;

 #ifdef FEAT_VREPLACE

diff --git a/src/evalfunc.c b/src/evalfunc.c

index 7dd5c2a..2edd610 100644

--- a/src/evalfunc.c

+++ b/src/evalfunc.c

@@ -5852,6 +5852,9 @@ f_has(typval_T *argvars, typval_T *rettv)

 	"user-commands",    /* was accidentally included in 5.4 */

 	"user_commands",

 #endif

+#ifdef FEAT_VARTABS

+	"vartabs",

+#endif

 #ifdef FEAT_VIMINFO

 	"viminfo",

 #endif

diff --git a/src/ex_cmds.c b/src/ex_cmds.c

index 6535de1..3221ab6 100644

--- a/src/ex_cmds.c

+++ b/src/ex_cmds.c

@@ -654,12 +654,17 @@ ex_retab(exarg_T *eap)

     long	vcol;

     long	start_col = 0;		/* For start of white-space string */

     long	start_vcol = 0;		/* For start of white-space string */

-    int		temp;

     long	old_len;

     char_u	*ptr;

     char_u	*new_line = (char_u *)1;    /* init to non-NULL */

     int		did_undo;		/* called u_save for current line */

+#ifdef FEAT_VARTABS

+    int		*new_ts = 0;

+    char_u	*new_ts_str;		/* string value of tab argument */

+#else

+    int		temp;

     int		new_ts;

+#endif

     int		save_list;

     linenr_T	first_line = 0;		/* first changed line */

     linenr_T	last_line = 0;		/* last changed line */

@@ -667,6 +672,27 @@ ex_retab(exarg_T *eap)

     save_list = curwin->w_p_list;

     curwin->w_p_list = 0;	    /* don't want list mode here */

+#ifdef FEAT_VARTABS

+    new_ts_str = eap->arg;

+    if (vim_isdigit(*(eap->arg)) && !tabstop_set(eap->arg, &new_ts))

+    {

+	EMSG(_(e_invarg));

+	return;

+    }

+    while (vim_isdigit(*(eap->arg)) || *(eap->arg) == ',')

+	++(eap->arg);

+

+    /* This ensures that either new_ts and new_ts_str are freshly allocated,

+     * or new_ts points to an existing array and new_ts_str is null.

+     */

+    if (new_ts == 0)

+    {

+	new_ts = curbuf->b_p_vts_ary;

+	new_ts_str = NULL;

+    }

+    else

+	new_ts_str = vim_strnsave(new_ts_str, eap->arg - new_ts_str);

+#else

     new_ts = getdigits(&(eap->arg));

     if (new_ts < 0)

     {

@@ -675,6 +701,7 @@ ex_retab(exarg_T *eap)

     }

     if (new_ts == 0)

 	new_ts = curbuf->b_p_ts;

+#endif

     for (lnum = eap->line1; !got_int && lnum <= eap->line2; ++lnum)

     {

 	ptr = ml_get(lnum);

@@ -707,6 +734,15 @@ ex_retab(exarg_T *eap)

 		    num_tabs = 0;

 		    if (!curbuf->b_p_et)

 		    {

+#ifdef FEAT_VARTABS

+			int t, s;

+			tabstop_fromto(start_vcol, vcol,

+				       tabstop_count(new_ts)? 0: curbuf->b_p_ts,

+				       new_ts,

+				       &t, &s);

+			num_tabs = t;

+			num_spaces = s;

+#else

 			temp = new_ts - (start_vcol % new_ts);

 			if (num_spaces >= temp)

 			{

@@ -715,6 +751,7 @@ ex_retab(exarg_T *eap)

 			}

 			num_tabs += num_spaces / new_ts;

 			num_spaces -= (num_spaces / new_ts) * new_ts;

+#endif

 		    }

 		    if (curbuf->b_p_et || got_tab ||

 					(num_spaces + num_tabs < len))

@@ -772,14 +809,54 @@ ex_retab(exarg_T *eap)

     if (got_int)

 	EMSG(_(e_interr));

+#ifdef FEAT_VARTABS

+    /* If a single value was given then it can be considered equal to

+     * either the value of 'tabstop' or the value of 'vartabstop'.

+     */

+    if (tabstop_count(curbuf->b_p_vts_ary) == 0

+	&& tabstop_count(new_ts) == 1

+	&& curbuf->b_p_ts == tabstop_first(new_ts))

+	; /* not changed */

+    else if (tabstop_count(curbuf->b_p_vts_ary) > 0

+        && tabstop_eq(curbuf->b_p_vts_ary, new_ts))

+	; /* not changed */

+    else

+	redraw_curbuf_later(NOT_VALID);

+#else

     if (curbuf->b_p_ts != new_ts)

 	redraw_curbuf_later(NOT_VALID);

+#endif

     if (first_line != 0)

 	changed_lines(first_line, 0, last_line + 1, 0L);

     curwin->w_p_list = save_list;	/* restore 'list' */