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

James Vega jamessan at debian.org
Thu Dec 4 03:21:05 UTC 2008


The following commit has been merged in the deb/langmap-escaped-comma branch:
commit 7d517ba12b1c03a49919f4fd0c1046b4b33274a4
Merge: 55486698e2de3bb796c1ee3e1985e1e83a5805ad c632f8d75f29664dc556e21808477e7a1014a32b
Author: James Vega <jamessan at debian.org>
Date:   Wed Dec 3 22:17:36 2008 -0500

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

diff --combined src/option.c
index 0c52ea4,15986f4..79a85b9
--- a/src/option.c
+++ b/src/option.c
@@@ -8232,13 -8232,13 +8232,13 @@@ set_option_value(name, number, string, 
  	    {
  		if (number == 0 && string != NULL)
  		{
- 		    int index;
+ 		    int idx;
  
  		    /* Either we are given a string or we are setting option
  		     * to zero. */
- 		    for (index = 0; string[index] == '0'; ++index)
+ 		    for (idx = 0; string[idx] == '0'; ++idx)
  			;
- 		    if (string[index] != NUL || index == 0)
+ 		    if (string[idx] != NUL || idx == 0)
  		    {
  			/* There's another character after zeros or the string
  			 * is empty.  In both cases, we are trying to set a
@@@ -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



More information about the pkg-vim-maintainers mailing list