[SCM] Vim packaging branch, deb/langmap-escaped-comma, updated. upstream/7.2b.001-35-gecbc7e4

[James Vega]

The following commit has been merged in the deb/langmap-escaped-comma branch:
commit ecbc7e432f15b640927ab07985ff6ebbb03158f2
Merge: fbb691826c4caa9c7bcd4e1fa79eee2a12fea9ef 7e43bd659780e0087f069b45997569a86457db11
Author: James Vega <jamessan at debian.org>
Date:   Fri Jul 25 10:25:58 2008 -0400

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

diff --combined src/option.c
index 6684113,04581a8..b1b3405
--- a/src/option.c
+++ b/src/option.c
@@@ -8622,8 -8622,9 +8622,9 @@@ makeset(fd, opt_flags, local_only
  #  endif
  # endif
  # if defined(FEAT_AUTOCMD)
- 			    p->indir == PV_FT)
+ 			    p->indir == PV_FT
  # endif
+ 			    )
  		    {
  			if (fprintf(fd, "if &%s != '%s'", p->fullname,
  						       *(char_u **)(varp)) < 0
@@@ -10122,7 -10123,7 +10123,7 @@@ langmap_set(
  {
      char_u  *p;
      char_u  *p2;
 -    int	    from, to;
 +    int	    from=NUL, to=NUL;
  
      langmap_init();			    /* back to one-to-one map first */
  
@@@ -10140,11 -10141,6 +10141,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
@@@ -10155,29 -10151,23 +10156,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