[SCM] Vim packaging branch, deb/vim-tiny, updated. upstream/7.1.285-78-g43378ed

James Vega jamessan at debian.org
Mon Jul 14 05:35:38 UTC 2008


The following commit has been merged in the deb/vim-tiny branch:
commit 43378edbe103755640907f7c128af0656f2364a5
Merge: 25555a37f523e23b66595730ae36e34bc241d9db e740e3a22ce4957772ccfa7d25ccb44d0a789409
Author: James Vega <jamessan at debian.org>
Date:   Mon Jul 14 01:16:08 2008 -0400

    Merge branch 'upstream' into deb/vim-tiny

diff --combined src/main.c
index f48ff64,587081b..14d4b3c
--- 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
  
@@@ -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)
@@@ -2754,12 -2747,7 +2754,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



More information about the pkg-vim-maintainers mailing list