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/runtime/defaults.vim b/runtime/defaults.vim
index f83e8bb55ae3dec6674f78597474c6d2b97e611d..1968ce9be7e95395c55bbd40b9f437c700a84676 100644 (file)
--- a/runtime/defaults.vim
+++ b/runtime/defaults.vim
@@ -1,7 +1,7 @@
 " The default vimrc file.
 "
 " Maintainer:  Bram Moolenaar <Bram@vim.org>
-" Last change: 2016 Jul 28
+" Last change: 2016 Jul 29
 "
 " This is loaded if no vimrc file was found.
 " Except when Vim is run with "-u NONE" or "-C".
@@ -25,6 +25,9 @@ set ruler             " show the cursor position all the time
 set showcmd            " display incomplete commands
 set wildmenu           " display completion matches in a status line
 
+" Show @@@ in the last line if it is truncated.
+set display=truncate
+
 " Do incremental searching when it's possible to timeout.
 if has('reltime')
   set incsearch

diff --git a/src/Makefile b/src/Makefile
index 6aa1308015bf53f974f3e9bc455f4477b1963485..7ef6e90c2d9136cc343376b7fe0c53a662b24380 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2107,6 +2107,7 @@ test_arglist \
        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 f24bda2387f6b58027c346bce66d246365434b1d..51e4483e3e7f243e9ac86605476b468316a0add4 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -90,6 +90,8 @@ static char *(main_errors[]) =
 
 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 @@ command_line_scan(mparm_T *parmp)
 
            case 'C':           /* "-C"  Compatible */
                change_compatible(TRUE);
+               has_dash_c_arg = TRUE;
                break;
 
            case 'e':           /* "-e" Ex mode */
@@ -3001,7 +3004,7 @@ source_startup_scripts(mparm_T *parmp)
 #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 78f0b0b5039bcba54dd7406d9a14fd18a4063a8f..ced52e0a3562875338f24059f3c875727955c5e7 100644 (file)
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -184,6 +184,7 @@ NEW_TESTS = test_arglist.res \
            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 (file)
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 b036bfd470f1c9489b26965a938f861a2c1f8298..37aa255ce51984cdcca240399b2d23b99ef09b41 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2115,
 /**/
     2114,
 /**/