aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.0.1607: --clean loads user settings from .gvimrc

Browse Source 
Problem:    --clean loads user settings from .gvimrc.
Solution:   Behave like "-U NONE" was used. (Ken Takata)
This commit is contained in:
Bram Moolenaar 2018-03-14 21:20:02 +01:00
parent 228de1dfd2
commit 62dd452d02
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
runtime/doc/starting.txt
View File

@ -510,11 +510,12 @@ a slash. Thus "-R" means recovery and "-/R" readonly.
{not in Vi} {not in Vi}
*--clean* *--clean*
--clean Equal to "-u DEFAULTS -i NONE": --clean Equal to "-u DEFAULTS -U NONE -i NONE":
- initializations from files and environment variables is - initializations from files and environment variables is
skipped skipped
- the |defaults.vim| script is loaded, which implies - the |defaults.vim| script is loaded, which implies
'nocompatible': use Vim defaults 'nocompatible': use Vim defaults
- no |gvimrc| script is loaded
- no viminfo file is read or written - no viminfo file is read or written
- the home directory is excluded from 'runtimepath' - the home directory is excluded from 'runtimepath'
*-x* *-x*

3
src/main.c
View File

@ -1881,6 +1881,9 @@ command_line_scan(mparm_T *parmp)
else if (STRNICMP(argv[0] + argv_idx, "clean", 5) == 0) else if (STRNICMP(argv[0] + argv_idx, "clean", 5) == 0)
{ {
parmp->use_vimrc = (char_u *)"DEFAULTS"; parmp->use_vimrc = (char_u *)"DEFAULTS";
#ifdef FEAT_GUI
use_gvimrc = (char_u *)"NONE";
#endif
parmp->clean = TRUE; parmp->clean = TRUE;
set_option_value((char_u *)"vif", 0L, (char_u *)"NONE", 0); set_option_value((char_u *)"vif", 0L, (char_u *)"NONE", 0);
} }

2
src/version.c
View File

@ -766,6 +766,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1607,
/**/ /**/
1606, 1606,
/**/ /**/