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

James Vega jamessan at debian.org
Mon Nov 24 02:47:05 UTC 2008


The following commit has been merged in the deb/langmap-escaped-comma branch:
commit 55486698e2de3bb796c1ee3e1985e1e83a5805ad
Merge: 7cb8480b202a9eb2fca114385ab4336da980e3ff 63683afb0256c99cbe5e0b9e41bbdfd5e6ba1a65
Author: James Vega <jamessan at debian.org>
Date:   Sun Nov 23 21:05:43 2008 -0500

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

diff --combined src/option.c
index da542e0,e8b8b0c..0c52ea4
--- a/src/option.c
+++ b/src/option.c
@@@ -2593,13 -2593,13 +2593,13 @@@ static struct vimoptio
  #ifdef FEAT_VIMINFO
  			    (char_u *)&p_viminfo, PV_NONE,
  #if defined(MSDOS) || defined(MSWIN) || defined(OS2)
- 			    {(char_u *)"", (char_u *)"'20,<50,s10,h,rA:,rB:"}
+ 			    {(char_u *)"", (char_u *)"'100,<50,s10,h,rA:,rB:"}
  #else
  # ifdef AMIGA
  			    {(char_u *)"",
- 				 (char_u *)"'20,<50,s10,h,rdf0:,rdf1:,rdf2:"}
+ 				 (char_u *)"'100,<50,s10,h,rdf0:,rdf1:,rdf2:"}
  # else
- 			    {(char_u *)"", (char_u *)"'20,<50,s10,h"}
+ 			    {(char_u *)"", (char_u *)"'100,<50,s10,h"}
  # endif
  #endif
  #else
@@@ -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