1. Ken Takata
  2. vim-ktakata-mq

Commits

Ken Takata  committed 9fad543

update for 7.4.353

Fix conflict.

  • Participants
  • Parent commits acea087
  • Branches default

Comments (0)

Files changed (1)

File tab-xyz.diff

View file
 # HG changeset patch
-# Parent 92c9748e0ccbc42a5e28ce8fb9b8818e756a06da
+# Parent 7b447bd669bb69174a9ae43b81ac2d48fa6824a5
+
 diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
 --- a/runtime/doc/options.txt
 +++ b/runtime/doc/options.txt
-@@ -4663,11 +4663,14 @@
+@@ -4713,11 +4713,14 @@ A jump table for the options with a shor
  			omitted, there is no extra character at the end of the
  			line.
  	  						*lcs-tab*
 diff --git a/src/globals.h b/src/globals.h
 --- a/src/globals.h
 +++ b/src/globals.h
-@@ -1160,6 +1160,7 @@
+@@ -1167,6 +1167,7 @@ EXTERN int	lcs_prec INIT(= NUL);
  EXTERN int	lcs_nbsp INIT(= NUL);
  EXTERN int	lcs_tab1 INIT(= NUL);
  EXTERN int	lcs_tab2 INIT(= NUL);
 diff --git a/src/message.c b/src/message.c
 --- a/src/message.c
 +++ b/src/message.c
-@@ -1646,6 +1646,7 @@
+@@ -1658,6 +1658,7 @@ msg_prt_line(s, list)
      int		col = 0;
      int		n_extra = 0;
      int		c_extra = 0;
      char_u	*p_extra = NULL;	    /* init to make SASC shut up */
      int		n;
      int		attr = 0;
-@@ -1676,8 +1677,13 @@
+@@ -1688,8 +1689,13 @@ msg_prt_line(s, list)
  	if (n_extra > 0)
  	{
  	    --n_extra;
  	    else
  		c = *p_extra++;
  	}
-@@ -1712,11 +1718,13 @@
+@@ -1724,11 +1730,13 @@ msg_prt_line(s, list)
  		{
  		    c = ' ';
  		    c_extra = ' ';
 diff --git a/src/option.c b/src/option.c
 --- a/src/option.c
 +++ b/src/option.c
-@@ -7238,7 +7238,7 @@
+@@ -7270,7 +7270,7 @@ set_chars_option(varp)
  {
      int		round, i, len, entries;
      char_u	*p, *s;
      struct charstab
      {
  	int	*cp;
-@@ -7331,6 +7331,16 @@
+@@ -7363,6 +7363,16 @@ set_chars_option(varp)
  #else
  			c2 = *s++;
  #endif
  		    }
  		    if (*s == ',' || *s == NUL)
  		    {
-@@ -7340,6 +7350,7 @@
+@@ -7372,6 +7382,7 @@ set_chars_option(varp)
  			    {
  				lcs_tab1 = c1;
  				lcs_tab2 = c2;
 diff --git a/src/screen.c b/src/screen.c
 --- a/src/screen.c
 +++ b/src/screen.c
-@@ -2854,6 +2854,7 @@
-     int		n_extra = 0;		/* number of extra chars */
+@@ -2845,6 +2845,7 @@ win_line(wp, lnum, startrow, endrow, noc
      char_u	*p_extra = NULL;	/* string of extra chars, plus NUL */
+     char_u	*p_extra_free = NULL;   /* p_extra needs to be freed */
      int		c_extra = NUL;		/* extra chars, all the same */
 +    int		c_end = NUL;		/* end char, for tab char */
      int		extra_attr = 0;		/* attributes when n_extra != 0 */
      static char_u *at_end_str = (char_u *)""; /* used for p_extra when
  					   displaying lcs_eol at end-of-line */
-@@ -3950,9 +3951,15 @@
+@@ -3973,9 +3974,15 @@ win_line(wp, lnum, startrow, endrow, noc
  	 */
  	if (n_extra > 0)
  	{
  #ifdef FEAT_MBYTE
  		mb_c = c;	/* doesn't handle non-utf-8 multi-byte! */
  		if (enc_utf8 && (*mb_char2len)(c) > 1)
-@@ -4477,6 +4484,7 @@
- 		    {
- 			c = lcs_tab1;
- 			c_extra = lcs_tab2;
+@@ -4554,6 +4561,7 @@ win_line(wp, lnum, startrow, endrow, noc
+ 			else
+ #endif
+ 			    c_extra = lcs_tab2;
 +			c_end = lcs_tab3;
- 			n_attr = n_extra + 1;
+ 			n_attr = tab_len + 1;
  			extra_attr = hl_attr(HLF_8);
  			saved_attr2 = char_attr; /* save current attr */
-@@ -4493,6 +4501,7 @@
+@@ -4570,6 +4578,7 @@ win_line(wp, lnum, startrow, endrow, noc
  		    else
  		    {
  			c_extra = ' ';