patch 8.1.1159: MS-Windows: with a silent (un)install $VIM/_vimrc is removed

Problem:    MS-Windows: with a silent (un)install $VIM/_vimrc is removed.
Solution:   Don't delete _vimrc in silent mode. (Ken Takata, closes #4242)

diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index 8336093be2c070992dd9f8c014b8a5a60c3ee170..2e990b8a057400b992162eef1ed9aa2651d166f7 100644 (file)
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -1096,7 +1096,9 @@ Section "un.$(str_unsection_rootdir)" id_unsection_rootdir
        Call un.GetParent
        Pop $0
 
-       Delete $0\_vimrc
+       ${IfNot} ${Silent}
+         Delete $0\_vimrc
+       ${Endif}
        RMDir $0
 SectionEnd
 

diff --git a/src/version.c b/src/version.c
index 7e5d406efd3f127cce0fbbee07937745d8ac68ed..46341eeb2d667c58babf3dcc42df97eb7c755b9a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1159,
 /**/
     1158,
 /**/