Skip to content

Commit 62dd452

Browse files
committed
patch 8.0.1607: --clean loads user settings from .gvimrc
Problem: --clean loads user settings from .gvimrc. Solution: Behave like "-U NONE" was used. (Ken Takata)
1 parent 228de1d commit 62dd452

3 files changed

Lines changed: 7 additions & 1 deletion

File tree

runtime/doc/starting.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,11 +510,12 @@ a slash. Thus "-R" means recovery and "-/R" readonly.
510510
{not in Vi}
511511

512512
*--clean*
513-
--clean Equal to "-u DEFAULTS -i NONE":
513+
--clean Equal to "-u DEFAULTS -U NONE -i NONE":
514514
- initializations from files and environment variables is
515515
skipped
516516
- the |defaults.vim| script is loaded, which implies
517517
'nocompatible': use Vim defaults
518+
- no |gvimrc| script is loaded
518519
- no viminfo file is read or written
519520
- the home directory is excluded from 'runtimepath'
520521
*-x*

src/main.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1881,6 +1881,9 @@ command_line_scan(mparm_T *parmp)
18811881
else if (STRNICMP(argv[0] + argv_idx, "clean", 5) == 0)
18821882
{
18831883
parmp->use_vimrc = (char_u *)"DEFAULTS";
1884+
#ifdef FEAT_GUI
1885+
use_gvimrc = (char_u *)"NONE";
1886+
#endif
18841887
parmp->clean = TRUE;
18851888
set_option_value((char_u *)"vif", 0L, (char_u *)"NONE", 0);
18861889
}

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,8 @@ static char *(features[]) =
766766

767767
static int included_patches[] =
768768
{ /* Add new patch number below this line */
769+
/**/
770+
1607,
769771
/**/
770772
1606,
771773
/**/

0 commit comments

Comments
 (0)