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

James Vega jamessan at debian.org
Mon Nov 24 02:47:10 UTC 2008


The following commit has been merged in the deb/vim-tiny branch:
commit 0d2a3b1f27f715328a1977fbe60f4a6796f947f8
Merge: 996e298a7b9586229165c6ccdac2b606d9f776f0 63683afb0256c99cbe5e0b9e41bbdfd5e6ba1a65
Author: James Vega <jamessan at debian.org>
Date:   Sun Nov 23 21:09:44 2008 -0500

    Merge branch 'upstream' into deb/vim-tiny

diff --combined src/main.c
index dbdbfe7,a091165..7ebfbf4
--- 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. */
@@@ -648,11 -645,12 +648,12 @@@ mai
  
  #ifdef FEAT_VIMINFO
      /*
-      * Read in registers, history etc, but not marks, from the viminfo file
+      * Read in registers, history etc, but not marks, from the viminfo file.
+      * This is where v:oldfiles gets filled.
       */
      if (*p_viminfo != NUL)
      {
- 	read_viminfo(NULL, TRUE, FALSE, FALSE);
+ 	read_viminfo(NULL, VIF_WANT_INFO | VIF_GET_OLDFILES);
  	TIME_MSG("reading viminfo");
      }
  #endif
@@@ -1478,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)
@@@ -1516,7 -1510,8 +1517,8 @@@
  early_arg_scan(parmp)
      mparm_T	*parmp;
  {
- #if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER)
+ #if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \
+ 	|| !defined(FEAT_NETBEANS_INTG)
      int		argc = parmp->argc;
      char	**argv = parmp->argv;
      int		i;
@@@ -1588,6 -1583,14 +1590,14 @@@
  	else if (STRICMP(argv[i], "--echo-wid") == 0)
  	    echo_wid_arg = TRUE;
  # endif
+ # ifndef FEAT_NETBEANS_INTG
+ 	else if (strncmp(argv[i], "-nb", (size_t)3) == 0)
+         {
+             mch_errmsg(_("'-nb' cannot be used: not enabled at compile time\n"));
+             mch_exit(2);
+         }
+ # endif
+ 
      }
  #endif
  }
@@@ -2594,7 -2597,7 +2604,7 @@@ edit_buffers(parmp
  # endif
  	    (void)do_ecmd(0, arg_idx < GARGCOUNT
  			  ? alist_name(&GARGLIST[arg_idx]) : NULL,
- 			  NULL, NULL, ECMD_LASTL, ECMD_HIDE);
+ 			  NULL, NULL, ECMD_LASTL, ECMD_HIDE, curwin);
  # ifdef HAS_SWAP_EXISTS_ACTION
  	    if (swap_exists_did_quit)
  	    {
@@@ -2764,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



More information about the pkg-vim-maintainers mailing list