[SCM] Vim packaging branch, deb/vim-tiny, updated. upstream/7.1.ds-287-g9ce851a

[James Vega]

The following commit has been merged in the deb/vim-tiny branch:
commit 9ce851a902098c3f7360f1f44f809e9bd8bdbb3a
Merge: f79327b855d955416196d3c9369881ec98722f53 d6d771252d9e53ab21b1af932d84b604a9285b9e
Author: James Vega <jamessan at debian.org>
Date:   Mon Mar 24 21:58:52 2008 -0400

    Merge branch 'upstream' into deb/vim-tiny

diff --combined src/main.c
index 6242245,2a02615..2e7bcb2
--- a/src/main.c
+++ b/src/main.c
@@@ -89,9 -89,6 +89,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. */
@@@ -1473,10 -1470,6 +1473,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)
@@@ -1559,15 -1552,15 +1559,15 @@@ early_arg_scan(parmp
  	else if (STRICMP(argv[i], "--socketid") == 0)
  #  endif
  	{
- 	    unsigned int    id;
- 	    int		    count;
+ 	    long_u	id;
+ 	    int		count;
  
  	    if (i == argc - 1)
  		mainerr_arg_missing((char_u *)argv[i]);
  	    if (STRNICMP(argv[i+1], "0x", 2) == 0)
- 		count = sscanf(&(argv[i + 1][2]), "%x", &id);
+ 		count = sscanf(&(argv[i + 1][2]), SCANF_HEX_LONG_U, &id);
  	    else
- 		count = sscanf(argv[i+1], "%u", &id);
+ 		count = sscanf(argv[i + 1], SCANF_DECIMAL_LONG_U, &id);
  	    if (count != 1)
  		mainerr(ME_INVALID_ARG, (char_u *)argv[i]);
  	    else
@@@ -2746,12 -2739,7 +2746,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);

-- 
Vim packaging