commit 62dd452d02f4a17f7e9fdfb3656b71bea62e12fe
author Bram Moolenaar <Bram@vim.org> Wed Mar 14 21:20:02 2018 +0100
committer Bram Moolenaar <Bram@vim.org> Wed Mar 14 21:20:02 2018 +0100
tree 83d80deb7f21b8d29f928ed3a1f08c9c1c44d053
parent 228de1dfd2687af16dc7bc88942c65b5af9d7e04

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)

src/main.c

diff --git a/src/main.c b/src/main.c
index ff01fd9..61543b1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1881,6 +1881,9 @@
 		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);
 		}

src/version.c

diff --git a/src/version.c b/src/version.c
index 4531c82..e7e3f49 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1607,
+/**/
     1606,
 /**/
     1605,