Mercurial > vim
changeset 9678:8c9e13109df8 v7.4.2115
commit https://github.com/vim/vim/commit/b9a46fec3e79d1fc8c406084a41733c647a5e535
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jul 29 18:13:42 2016 +0200
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".
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Fri, 29 Jul 2016 18:15:05 +0200 |
parents | 1f467eeff9a6 |
children | 5028439c944d |
files | runtime/defaults.vim src/Makefile src/main.c src/testdir/Make_all.mak src/testdir/test_startup.vim src/version.c |
diffstat | 6 files changed, 20 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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 al 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
--- 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 \
--- 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);
--- 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 \