diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-03-14 21:20:02 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-03-14 21:20:02 +0100 |
| commit | 62dd452d02f4a17f7e9fdfb3656b71bea62e12fe (patch) | |
| tree | 83d80deb7f21b8d29f928ed3a1f08c9c1c44d053 | |
| parent | 228de1dfd2687af16dc7bc88942c65b5af9d7e04 (diff) | |
| download | vim-git-62dd452d02f4a17f7e9fdfb3656b71bea62e12fe.tar.gz | |
patch 8.0.1607: --clean loads user settings from .gvimrcv8.0.1607
Problem: --clean loads user settings from .gvimrc.
Solution: Behave like "-U NONE" was used. (Ken Takata)
| -rw-r--r-- | runtime/doc/starting.txt | 3 | ||||
| -rw-r--r-- | src/main.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index 235846043..9d5e43f3d 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -510,11 +510,12 @@ a slash. Thus "-R" means recovery and "-/R" readonly. {not in Vi} *--clean* ---clean Equal to "-u DEFAULTS -i NONE": +--clean Equal to "-u DEFAULTS -U NONE -i NONE": - initializations from files and environment variables is skipped - the |defaults.vim| script is loaded, which implies 'nocompatible': use Vim defaults + - no |gvimrc| script is loaded - no viminfo file is read or written - the home directory is excluded from 'runtimepath' *-x* diff --git a/src/main.c b/src/main.c index ff01fd968..61543b171 100644 --- a/src/main.c +++ b/src/main.c @@ -1881,6 +1881,9 @@ command_line_scan(mparm_T *parmp) else if (STRNICMP(argv[0] + argv_idx, "clean", 5) == 0) { parmp->use_vimrc = (char_u *)"DEFAULTS"; +#ifdef FEAT_GUI + use_gvimrc = (char_u *)"NONE"; +#endif parmp->clean = TRUE; set_option_value((char_u *)"vif", 0L, (char_u *)"NONE", 0); } diff --git a/src/version.c b/src/version.c index 4531c82c3..e7e3f493f 100644 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1607, +/**/ 1606, /**/ 1605, |