[SCM] Vim packaging branch, master, updated. upstream/7.1.ds-373-gd0783d6

[James Vega]

The following commit has been merged in the master branch:
commit 56f035a19e389963f64b642837c26077fea97275
Merge: e8ac8b8342f0a9ecd3ddf6b4dda5b78c463eb29e 3ea27e67fe38e13fbe4589d47549c4616c2af544 44483d764d6383f0b00c2d9273f74e42f8902bdd
Author: James Vega <jamessan at debian.org>
Date:   Thu Mar 27 02:58:55 2008 -0400

    Merge branches 'debian', 'upstream' and 'deb/runtime'

diff --combined src/main.c
index ce11b35,2a02615,2a02615..e5c343d
--- a/src/main.c
+++ b/src/main.c
@@@@ -37,9 -37,6 -37,6 +37,9 @@@@
   #define	WIN_VER	    2	    /* "-O" vertically split windows */
   #define	WIN_TABS    3	    /* "-p" windows on tab pages */
   
 ++#define SET_CP   1  /* "-C" set compatible */
 ++#define SET_NOCP 2  /* "-N" set nocompatible */
 ++
   /* Struct for various parameters passed between main() and other functions. */
   typedef struct
   {
@@@@ -92,10 -89,6 -89,6 +92,10 @@@@
   #ifdef FEAT_DIFF
       int		diff_mode;		/* start with 'diff' set */
   #endif
 ++    int		option_cp;		/* 0, SET_CP, SET_NOCP */
 ++#ifdef SYS_TINYRC_FILE
 ++    int		vi_mode;		/* started as "vi" */
 ++#endif
   } mparm_T;
   
   /* Values for edit_type. */
@@@@ -648,13 -641,6 -641,6 +648,13 @@@@ mai
       }
   #endif
   
 ++    /* -N/-C given on the command-line.  Now that the startup files are done
 ++     * being sourced, we set the option. */
 ++    if (params.option_cp == SET_CP)
 ++	change_compatible(TRUE);
 ++    else if (params.option_cp == SET_NOCP)
 ++	change_compatible(FALSE);
 ++
   #ifdef SPAWNO		/* special MSDOS swapping library */
       init_SPAWNO("", SWAP_ANY);
   #endif
@@@@ -1484,10 -1470,6 -1470,6 +1484,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)
@@@@ -1570,15 -1552,15 -1552,15 +1570,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
@@@@ -1769,7 -1751,7 -1751,7 +1769,7 @@@@ command_line_scan(parmp
   		break;
   
   	    case 'C':		/* "-C"  Compatible */
 --		change_compatible(TRUE);
 ++		parmp->option_cp = SET_CP;
   		break;
   
   	    case 'e':		/* "-e" Ex mode */
@@@@ -1842,7 -1824,7 -1824,7 +1842,7 @@@@
   		break;
   
   	    case 'N':		/* "-N"  Nocompatible */
 --		change_compatible(FALSE);
 ++		parmp->option_cp = SET_NOCP;
   		break;
   
   	    case 'n':		/* "-n" no swap file */
@@@@ -2757,12 -2739,7 -2739,7 +2757,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