# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1521059406 -3600
# Node ID cf7cd02720114d86b2b28fae943e26c300d7a840
# Parent  cfeb8bdb9bbd6eb9d89fa6b1bca66ce800b0e361
patch 8.0.1607: --clean loads user settings from .gvimrc

commit https://github.com/vim/vim/commit/62dd452d02f4a17f7e9fdfb3656b71bea62e12fe
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Mar 14 21:20:02 2018 +0100

    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)

diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -510,11 +510,12 @@ a slash.  Thus "-R" means recovery and "
 		{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
--- 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
--- 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,