[SCM] Vim packaging branch, deb/vim-tiny, updated. upstream/7.2.025-64-g008317c

[James Vega]

The following commit has been merged in the deb/vim-tiny branch:
commit 008317c8e18f27f7f4545f41b368a270470b0477
Merge: 0d2a3b1f27f715328a1977fbe60f4a6796f947f8 c632f8d75f29664dc556e21808477e7a1014a32b
Author: James Vega <jamessan at debian.org>
Date:   Wed Dec 3 22:17:38 2008 -0500

    Merge branch 'upstream' into deb/vim-tiny

diff --combined src/main.c
index 7ebfbf4,9f56e88..94d595f
--- 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. */
@@@ -1479,10 -1476,6 +1479,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)
@@@ -2379,7 -2372,7 +2379,7 @@@ read_stdin(
       * Is there any other system that cannot do this?
       */
      close(0);
-     dup(2);
+     ignored = dup(2);
  #endif
  }
  
@@@ -2774,12 -2767,7 +2774,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