aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 7.4.2115

Browse Source 
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".
This commit is contained in:
Bram Moolenaar
2016-07-29 18:13:42 +02:00
parent d05b191b91
commit b9a46fec3e
6 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main.c
View File

@@ -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);