[SCM] Vim packaging branch, master-experimental, updated. debian/7.2.0a-1-54-g517909d

[James Vega]

The following commit has been merged in the master-experimental branch:
commit 09a8e5834b0288121396eb2a2e08487d2042a037
Merge: f31dd75b6bdbdfa6dbb18bd541d3a9367b6b766e 56a6d59305596834009497f44cf1a6ccd93bd0f6
Author: James Vega <jamessan at debian.org>
Date:   Tue Jul 8 12:34:36 2008 -0400

    Merge branch 'deb/runtime' into master-experimental

diff --combined src/main.c
index 079b452,53d1848..3de49db
--- a/src/main.c
+++ b/src/main.c
@@@ -20,7 -20,9 +20,9 @@@
  
  #ifdef __CYGWIN__
  # ifndef WIN32
- #  include <sys/cygwin.h>	/* for cygwin_conv_to_posix_path() */
+ #  include <cygwin/version.h>
+ #  include <sys/cygwin.h>	/* for cygwin_conv_to_posix_path() and/or
+ 				 * cygwin_conv_path() */
  # endif
  # include <limits.h>
  #endif
@@@ -33,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
  {
@@@ -88,10 -87,6 +90,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. */
@@@ -644,13 -639,6 +646,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
@@@ -1486,10 -1474,6 +1488,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)
@@@ -1771,7 -1755,7 +1773,7 @@@ command_line_scan(parmp
  		break;
  
  	    case 'C':		/* "-C"  Compatible */
 -		change_compatible(TRUE);
 +		parmp->option_cp = SET_CP;
  		break;
  
  	    case 'e':		/* "-e" Ex mode */
@@@ -1844,7 -1828,7 +1846,7 @@@
  		break;
  
  	    case 'N':		/* "-N"  Nocompatible */
 -		change_compatible(FALSE);
 +		parmp->option_cp = SET_NOCP;
  		break;
  
  	    case 'n':		/* "-n" no swap file */
@@@ -2231,7 -2215,11 +2233,11 @@@ scripterror
  	    {
  		char posix_path[PATH_MAX];
  
+ # if CYGWIN_VERSION_DLL_MAJOR >= 1007
+ 		cygwin_conv_path(CCP_WIN_A_TO_POSIX, p, posix_path, PATH_MAX);
+ # else
  		cygwin_conv_to_posix_path(p, posix_path);
+ # endif
  		vim_free(p);
  		p = vim_strsave(posix_path);
  		if (p == NULL)
@@@ -2759,12 -2747,7 +2765,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 307e901,2d47af3..6684113
--- a/src/option.c
+++ b/src/option.c
@@@ -8222,7 -8222,7 +8222,7 @@@ set_option_value(name, number, string, 
  	    set_string_option(opt_idx, string, opt_flags);
  	else
  	{
- 	    varp = get_varp(&options[opt_idx]);
+ 	    varp = get_varp_scope(&(options[opt_idx]), opt_flags);
  	    if (varp != NULL)	/* hidden option is not changed */
  	    {
  		if (number == 0 && string != NULL)
@@@ -10122,7 -10122,7 +10122,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 */
  
@@@ -10140,11 -10140,6 +10140,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
@@@ -10155,29 -10150,23 +10155,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