Mercurial > vim

changeset 16308:6400235ca4ad v8.1.1159

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1159: MS-Windows: with a silent (un)install $VIM/_vimrc is removed commit https://github.com/vim/vim/commit/a8d22e3a40483cd1fa9c6e45dcf383f49f16833a Author: Bram Moolenaar <Bram@vim.org> Date: Fri Apr 12 21:29:33 2019 +0200 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 https://github.com/vim/vim/issues/4242)
author Bram Moolenaar <Bram@vim.org>
date Fri, 12 Apr 2019 21:30:05 +0200
parents 8b595d158a1f
children f21de4c36152
files nsis/gvim.nsi src/version.c
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -1096,7 +1096,9 @@ Section "un.$(str_unsection_rootdir)" id
 	Call un.GetParent
 	Pop $0
 
-	Delete $0\_vimrc
+	${IfNot} ${Silent}
+	  Delete $0\_vimrc
+	${Endif}
 	RMDir $0
 SectionEnd
 
--- 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,