[SCM] Vim packaging branch, master, updated. debian/7.2.049-2-46-gaa37cdb

[James Vega]

The following commit has been merged in the master branch:
commit 24d21d8800c7bc7474825aa64676fde7fd65b450
Merge: 0f85b33c677af16ecfaf28f91493fc7f60df5c47 b5182c2267e2218ece6c4864fb7440801aad9efa
Author: James Vega <jamessan at debian.org>
Date:   Sun Jan 11 11:45:23 2009 -0500

    Merge branch 'deb/runtime'

diff --combined src/main.c
index 7ebfbf4,9f56e88..94d595f
--- a/src/main.c
+++ b/src/main.c
@@@ -87,9 -87,6 +87,9 @@@ typedef struc
  #ifdef FEAT_DIFF
      int		diff_mode;		/* start with 'diff' set */
  #endif
 +#ifdef SYS_TINYRC_FILE
 +    int		vi_mode;		/* started as "vi" */
 +#endif
  } mparm_T;
  
  /* Values for edit_type. */
@@@ -1479,10 -1476,6 +1479,10 @@@ parse_command_name(parmp
      }
      else if (STRNICMP(initstr, "vim", 3) == 0)
  	initstr += 3;
 +#ifdef SYS_TINYRC_FILE
 +    else if (STRNICMP(initstr, "vi", 2) == 0)
 +	parmp->vi_mode = TRUE;
 +#endif
  
      /* Catch "[r][g]vimdiff" and "[r][g]viewdiff". */
      if (STRICMP(initstr, "diff") == 0)
@@@ -2379,7 -2372,7 +2379,7 @@@ read_stdin(
       * Is there any other system that cannot do this?
       */
      close(0);
-     dup(2);
+     ignored = dup(2);
  #endif
  }
  
@@@ -2774,12 -2767,7 +2774,12 @@@ source_startup_scripts(parmp
  	 * Get system wide defaults, if the file name is defined.
  	 */
  #ifdef SYS_VIMRC_FILE
 -	(void)do_source((char_u *)SYS_VIMRC_FILE, FALSE, DOSO_NONE);
 +# if defined(SYS_TINYRC_FILE) && defined(TINY_VIMRC)
 +	if (parmp->vi_mode)
 +	    (void)do_source((char_u *)SYS_TINYRC_FILE, FALSE, DOSO_NONE);
 +	else
 +# endif
 +	    (void)do_source((char_u *)SYS_VIMRC_FILE, FALSE, DOSO_NONE);
  #endif
  #ifdef MACOS_X
  	(void)do_source((char_u *)"$VIMRUNTIME/macmap.vim", FALSE, DOSO_NONE);
diff --combined src/option.c
index 0c52ea4,8fa298c..0605360
--- 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
@@@ -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