[SCM] Vim packaging branch, deb/langmap-escaped-comma, updated. upstream/7.1.285-76-ge76edfe

[James Vega]

The following commit has been merged in the deb/langmap-escaped-comma branch:
commit e76edfe23ec6e951c1bfcebbbd4bf229fa8bad0c
Merge: 9d171254fb0ec7627fe324863bf4a0b9bb728972 3ad14809108dad7f23c25ff9d64851796b6d4f0d
Author: James Vega <jamessan at debian.org>
Date:   Tue Jul 8 12:33:43 2008 -0400

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

diff --combined src/option.c
index 307e901,2d47af3..6684113
--- a/src/option.c
+++ b/src/option.c
@@@ -8222,7 -8222,7 +8222,7 @@@ set_option_value(name, number, string, 
  	    set_string_option(opt_idx, string, opt_flags);
  	else
  	{
- 	    varp = get_varp(&options[opt_idx]);
+ 	    varp = get_varp_scope(&(options[opt_idx]), opt_flags);
  	    if (varp != NULL)	/* hidden option is not changed */
  	    {
  		if (number == 0 && string != NULL)
@@@ -10122,7 -10122,7 +10122,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 -10140,6 +10140,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 -10150,23 +10155,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