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, /**/