[SCM] Vim packaging branch, deb/vim-tiny, updated. upstream/7.2b.001-35-g5a7d52b

[James Vega]

The following commit has been merged in the deb/vim-tiny branch:
commit 5a7d52b96928e7e5e8543dfe31ccaea6c704045d
Merge: 2198071c2a68898ff98a68fa85401a95aee62df8 7e43bd659780e0087f069b45997569a86457db11
Author: James Vega <jamessan at debian.org>
Date:   Fri Jul 25 10:26:00 2008 -0400

    Merge branch 'upstream' into deb/vim-tiny

diff --combined src/main.c
index 14d4b3c,a9eb460..e4acabf
--- 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. */
@@@ -1477,10 -1474,6 +1477,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)
@@@ -2252,7 -2245,12 +2252,12 @@@ scripterror
  		/* Remember this argument has been added to the argument list.
  		 * Needed when 'encoding' is changed. */
  		used_file_arg(argv[0], parmp->literal, parmp->full_path,
- 							    parmp->diff_mode);
+ # ifdef FEAT_DIFF
+ 							    parmp->diff_mode
+ # else
+ 							    FALSE
+ # endif
+ 							    );
  	    }
  #endif
  	}
@@@ -2531,7 -2529,6 +2536,6 @@@ edit_buffers(parmp
      int		arg_idx;		/* index in argument list */
      int		i;
      int		advance = TRUE;
-     buf_T	*old_curbuf;
  
  # ifdef FEAT_AUTOCMD
      /*
@@@ -2584,21 -2581,26 +2588,26 @@@
  	    curwin->w_arg_idx = arg_idx;
  	    /* Edit file from arg list, if there is one.  When "Quit" selected
  	     * at the ATTENTION prompt close the window. */
- 	    old_curbuf = curbuf;
+ # ifdef HAS_SWAP_EXISTS_ACTION
+ 	    swap_exists_did_quit = FALSE;
+ # endif
  	    (void)do_ecmd(0, arg_idx < GARGCOUNT
  			  ? alist_name(&GARGLIST[arg_idx]) : NULL,
  			  NULL, NULL, ECMD_LASTL, ECMD_HIDE);
- 	    if (curbuf == old_curbuf)
+ # ifdef HAS_SWAP_EXISTS_ACTION
+ 	    if (swap_exists_did_quit)
  	    {
+ 		/* abort or quit selected */
  		if (got_int || only_one_window())
  		{
- 		    /* abort selected or quit and only one window */
+ 		    /* abort selected and only one window */
  		    did_emsg = FALSE;   /* avoid hit-enter prompt */
  		    getout(1);
  		}
  		win_close(curwin, TRUE);
  		advance = FALSE;
  	    }
+ # endif
  	    if (arg_idx == GARGCOUNT - 1)
  		arg_had_last = TRUE;
  	    ++arg_idx;
@@@ -2754,12 -2756,7 +2763,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