[SCM] Vim packaging branch, deb/set-cp-after-init, updated. upstream/7.1.285-78-ga9a4021

[James Vega]

The following commit has been merged in the deb/set-cp-after-init branch:
commit a9a4021adcaace6c40e9be157c1ce14584d30c36
Merge: 515d6034bfc5943d1e4a28ae55f31bf81e9ec87d e740e3a22ce4957772ccfa7d25ccb44d0a789409
Author: James Vega <jamessan at debian.org>
Date:   Mon Jul 14 01:15:12 2008 -0400

    Merge branch 'upstream' into deb/set-cp-after-init

diff --combined src/main.c
index 454b53c,587081b..df81ed1
--- a/src/main.c
+++ b/src/main.c
@@@ -7,7 -7,7 +7,7 @@@
   * See README.txt for an overview of the Vim source code.
   */
  
- #if defined(MSDOS) || defined(WIN32) || defined(_WIN64)
+ #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
  # include "vimio.h"		/* for close() and dup() */
  #endif
  
@@@ -35,9 -35,6 +35,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
  {
@@@ -90,7 -87,6 +90,7 @@@
  #ifdef FEAT_DIFF
      int		diff_mode;		/* start with 'diff' set */
  #endif
 +    int		option_cp;		/* 0, SET_CP, SET_NOCP */
  } mparm_T;
  
  /* Values for edit_type. */
@@@ -643,13 -639,6 +643,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
@@@ -1766,7 -1755,7 +1766,7 @@@ command_line_scan(parmp
  		break;
  
  	    case 'C':		/* "-C"  Compatible */
 -		change_compatible(TRUE);
 +		parmp->option_cp = SET_CP;
  		break;
  
  	    case 'e':		/* "-e" Ex mode */
@@@ -1839,7 -1828,7 +1839,7 @@@
  		break;
  
  	    case 'N':		/* "-N"  Nocompatible */
 -		change_compatible(FALSE);
 +		parmp->option_cp = SET_NOCP;
  		break;
  
  	    case 'n':		/* "-n" no swap file */

-- 
Vim packaging