[SCM] Vim packaging branch, deb/langmap-escaped-comma, updated. upstream/7.2.130-149-g6d356ee

[James Vega]

The following commit has been merged in the deb/langmap-escaped-comma branch:
commit 6d356eeb9d883a947fd646adfe310efaa3e5eed0
Merge: e5df032886e27cbfb3bb532f8b5056604246e53f c8e947d5caa7b63dc4b4038310b0effc9f30caa8
Author: James Vega <jamessan at debian.org>
Date:   Wed Jul 29 19:56:00 2009 +0200

    Merge branch 'upstream' into deb/langmap-escaped-comma

diff --combined src/option.c
index 757bb68,0f69322..fca1d86
--- a/src/option.c
+++ b/src/option.c
@@@ -7194,6 -7194,14 +7194,14 @@@ set_bool_option(opt_idx, varp, value, o
  	compatible_set();
      }
  
+     /* 'list', 'number' */
+     else if ((int *)varp == &curwin->w_p_list
+ 	  || (int *)varp == &curwin->w_p_nu)
+     {
+ 	if (curwin->w_curswant != MAXCOL)
+ 	    curwin->w_set_curswant = TRUE;
+     }
+ 
      else if ((int *)varp == &curbuf->b_p_ro)
      {
  	/* when 'readonly' is reset globally, also reset readonlymode */
@@@ -7645,6 -7653,14 +7653,14 @@@
  	    curbuf->b_p_imsearch = B_IMODE_USE_INSERT;
  # endif
  	}
+ 	if (curwin->w_curswant != MAXCOL)
+ 	    curwin->w_set_curswant = TRUE;
+     }
+ 
+     else if ((int *)varp == &p_arshape)
+     {
+ 	if (curwin->w_curswant != MAXCOL)
+ 	    curwin->w_set_curswant = TRUE;
      }
  #endif
  
@@@ -7655,8 -7671,7 +7671,7 @@@
      options[opt_idx].flags |= P_WAS_SET;
  
      comp_col();			    /* in case 'ruler' or 'showcmd' changed */
-     if (curwin->w_curswant != MAXCOL)
- 	curwin->w_set_curswant = TRUE;  /* in case 'list' changed */
+ 
      check_redraw(options[opt_idx].flags);
  
      return NULL;
@@@ -10344,7 -10359,7 +10359,7 @@@ langmap_set(
  {
      char_u  *p;
      char_u  *p2;
 -    int	    from, to;
 +    int	    from=NUL, to=NUL;
  
  #ifdef FEAT_MBYTE
      ga_clear(&langmap_mapga);		    /* clear the previous map first */
@@@ -10365,11 -10380,6 +10380,11 @@@
  	    p2 = NULL;	    /* aAbBcCdD form, p2 is NULL */
  	while (p[0])
  	{
 +	    if (p[0] == ',')
 +	    {
 +		++p;
 +		break;
 +	    }
  	    if (p[0] == '\\' && p[1] != NUL)
  		++p;
  #ifdef FEAT_MBYTE
@@@ -10380,29 -10390,23 +10395,29 @@@
  	    if (p2 == NULL)
  	    {
  		mb_ptr_adv(p);
 -		if (p[0] == '\\')
 -		    ++p;
 +		if (p[0] != ',')
 +		{
 +		    if (p[0] == '\\')
 +			++p;
  #ifdef FEAT_MBYTE
 -		to = (*mb_ptr2char)(p);
 +		    to = (*mb_ptr2char)(p);
  #else
 -		to = p[0];
 +		    to = p[0];
  #endif
 +		}
  	    }
  	    else
  	    {
 -		if (p2[0] == '\\')
 -		    ++p2;
 +		if (p2[0] != ',')
 +		{
 +		    if (p2[0] == '\\')
 +			++p2;
  #ifdef FEAT_MBYTE
 -		to = (*mb_ptr2char)(p2);
 +		    to = (*mb_ptr2char)(p2);
  #else
 -		to = p2[0];
 +		    to = p2[0];
  #endif
 +		}
  	    }
  	    if (to == NUL)
  	    {

-- 
Vim packaging