diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-04-12 21:29:33 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-04-12 21:29:33 +0200 |
commit | a8d22e3a40483cd1fa9c6e45dcf383f49f16833a (patch) | |
tree | a6e0e4b651c891f9dc37f1f29962fe13a3f1fae6 | |
parent | 04af19637c14045fa33b99576de4eea1e3524edb (diff) |
patch 8.1.1159: MS-Windows: with a silent (un)install $VIM/_vimrc is removedv8.1.1159
Problem: MS-Windows: with a silent (un)install $VIM/_vimrc is removed.
Solution: Don't delete _vimrc in silent mode. (Ken Takata, closes #4242)
-rw-r--r-- | nsis/gvim.nsi | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
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 @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1159, +/**/ 1158, /**/ 1157, |