[SCM] Vim packaging branch, deb/vim-tiny, updated. upstream/7.2.130-97-gb4e3011
James Vega
jamessan at debian.org
Fri Jun 5 20:55:20 UTC 2009
The following commit has been merged in the deb/vim-tiny branch:
commit d6c46d0dd7fd74c6504b7ada0e8f5c9d1ba41cef
Merge: 3ede9c5f1b754ccb55076484a054734b0c2bcd2a 31eb4e3c842a44bb3d3a8913b42e34ee6c237674
Author: James Vega <jamessan at debian.org>
Date: Wed Jun 3 02:35:18 2009 -0400
Merge branch 'upstream' into deb/vim-tiny
diff --combined src/main.c
index 94d595f,84aa146..4f159dc
--- 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. */
@@@ -938,8 -935,14 +938,14 @@@ mai
/*
* Call the main command loop. This never returns.
+ * For embedded MzScheme the main_loop will be called by Scheme
+ * for proper stack tracking
*/
+ #ifndef FEAT_MZSCHEME
main_loop(FALSE, FALSE);
+ #else
+ mzscheme_main();
+ #endif
return 0;
}
@@@ -1479,10 -1482,6 +1485,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)
@@@ -1512,10 -1511,9 +1518,9 @@@
*
* Also find the --server... arguments and --socketid and --windowid
*/
- /*ARGSUSED*/
static void
early_arg_scan(parmp)
- mparm_T *parmp;
+ mparm_T *parmp UNUSED;
{
#if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \
|| !defined(FEAT_NETBEANS_INTG)
@@@ -2387,10 -2385,9 +2392,9 @@@ read_stdin(
* Create the requested number of windows and edit buffers in them.
* Also does recovery if "recoverymode" set.
*/
- /*ARGSUSED*/
static void
create_windows(parmp)
- mparm_T *parmp;
+ mparm_T *parmp UNUSED;
{
#ifdef FEAT_WINDOWS
int dorewind;
@@@ -2774,12 -2771,7 +2778,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);
@@@ -3863,10 -3855,9 +3867,9 @@@ eval_client_expr_to_string(expr
* return an allocated string. Otherwise return "data".
* "*tofree" is set to the result when it needs to be freed later.
*/
- /*ARGSUSED*/
char_u *
serverConvert(client_enc, data, tofree)
- char_u *client_enc;
+ char_u *client_enc UNUSED;
char_u *data;
char_u **tofree;
{
diff --combined src/os_unix.h
index 98ea3fd,944cc1b..63a781f
--- a/src/os_unix.h
+++ b/src/os_unix.h
@@@ -124,7 -124,7 +124,7 @@@
# define SIGDUMMYARG 0, 0, (struct sigcontext *)0
# else
# define SIGPROTOARG (int)
- # define SIGDEFARG(s) (s) int s;
+ # define SIGDEFARG(s) (s) int s UNUSED;
# define SIGDUMMYARG 0
# endif
#else
@@@ -237,9 -237,6 +237,9 @@@ typedef struct dsc$descriptor DESC
/*
* Unix system-dependent file names
*/
+#ifndef SYS_TINYRC_FILE
+# define SYS_TINYRC_FILE "$VIM/vimrc.tiny"
+#endif
#ifndef SYS_VIMRC_FILE
# define SYS_VIMRC_FILE "$VIM/vimrc"
#endif
--
Vim packaging
More information about the pkg-vim-maintainers
mailing list