From a8d22e3a40483cd1fa9c6e45dcf383f49f16833a Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 12 Apr 2019 21:29:33 +0200 Subject: 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) --- nsis/gvim.nsi | 4 +++- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi index 8336093be2..2e990b8a05 100644 --- 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 7e5d406efd..46341eeb2d 100644 --- 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, /**/ -- cgit v1.2.3