[SCM] Vim packaging branch, deb/vim-tiny, updated. upstream/7.2.000-42-g41a0752
James Vega
jamessan at debian.org
Sat Sep 27 20:46:13 UTC 2008
The following commit has been merged in the deb/vim-tiny branch:
commit 41a0752a2d926b840dcabd1cd44b247138e6b988
Merge: ea9e26223e56de846ed5cc45533cee6640772bf6 7a87d60951cd57499ca40285924edd1dca5c3116
Author: James Vega <jamessan at debian.org>
Date: Sat Sep 27 14:33:04 2008 -0400
Merge branch 'upstream' into deb/vim-tiny
diff --combined src/main.c
index e4acabf,0fc5941..dbdbfe7
--- 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. */
@@@ -1460,7 -1457,8 +1460,8 @@@ parse_command_name(parmp
++initstr;
}
- if (TOLOWER_ASC(initstr[0]) == 'g' || initstr[0] == 'k')
+ /* "gvim" starts the GUI. Also accept "Gvim" for MS-Windows. */
+ if (TOLOWER_ASC(initstr[0]) == 'g')
{
main_start_gui();
#ifdef FEAT_GUI
@@@ -1477,10 -1475,6 +1478,10 @@@
}
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)
@@@ -2763,12 -2757,7 +2764,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