patch 7.4.2115
Problem: Loading defaults.vim with -C argument.
Solution: Don't load the defaults script with -C argument. Test sourcing
the defaults script. Set 'display' to "truncate".
diff --git a/src/Makefile b/src/Makefile
index 6aa1308..7ef6e90 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2107,6 +2107,7 @@
test_regexp_utf8 \
test_reltime \
test_ruby \
+ test_startup \
test_searchpos \
test_set \
test_sort \
diff --git a/src/main.c b/src/main.c
index f24bda2..51e4483 100644
--- a/src/main.c
+++ b/src/main.c
@@ -90,6 +90,8 @@
static char_u *start_dir = NULL; /* current working dir on startup */
+static int has_dash_c_arg = FALSE;
+
int
# ifdef VIMDLL
_export
@@ -1928,6 +1930,7 @@
case 'C': /* "-C" Compatible */
change_compatible(TRUE);
+ has_dash_c_arg = TRUE;
break;
case 'e': /* "-e" Ex mode */
@@ -3001,7 +3004,7 @@
#ifdef USR_EXRC_FILE2
&& do_source((char_u *)USR_EXRC_FILE2, FALSE, DOSO_NONE) == FAIL
#endif
- )
+ && !has_dash_c_arg)
{
/* When no .vimrc file was found: source defaults.vim. */
do_source((char_u *)VIM_DEFAULTS_FILE, FALSE, DOSO_NONE);
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index 78f0b0b..ced52e0 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -184,6 +184,7 @@
test_perl.res \
test_quickfix.res \
test_ruby.res \
+ test_startup.res \
test_stat.res \
test_syntax.res \
test_textobjects.res \
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
new file mode 100644
index 0000000..0630b2a
--- /dev/null
+++ b/src/testdir/test_startup.vim
@@ -0,0 +1,8 @@
+" Check that loading startup.vim works.
+
+func Test_startup_script()
+ set compatible
+ source $VIMRUNTIME/defaults.vim
+
+ call assert_equal(0, &compatible)
+endfunc
diff --git a/src/version.c b/src/version.c
index b036bfd..37aa255 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2115,
+/**/
2114,
/**/
2113,