[SCM] Vim packaging branch, deb/langmap-escaped-comma, updated. upstream/7.2.025-79-g68b5b86

[James Vega]

The following commit has been merged in the deb/langmap-escaped-comma branch:
commit 68b5b860b19037f0ec4b60e2aec5470daa795f95
Merge: 7d517ba12b1c03a49919f4fd0c1046b4b33274a4 8090c0cf678056d217e8c8a98051f7644164f7c8
Author: James Vega <jamessan at debian.org>
Date:   Wed Jan 7 11:16:15 2009 -0500

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

diff --combined src/option.c
index 79a85b9,8fa298c..0605360
--- a/src/option.c
+++ b/src/option.c
@@@ -8328,7 -8328,7 +8328,7 @@@ find_key_option(arg
      {
  	--arg;			    /* put arg at the '<' */
  	modifiers = 0;
- 	key = find_special_key(&arg, &modifiers, TRUE);
+ 	key = find_special_key(&arg, &modifiers, TRUE, TRUE);
  	if (modifiers)		    /* can't handle modifiers here */
  	    key = 0;
      }
@@@ -10128,7 -10128,7 +10128,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 */
  
@@@ -10146,11 -10146,6 +10146,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
@@@ -10161,29 -10156,23 +10161,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