patch 9.0.0258: MS-Windows installer skips syntax/shared

Problem:    MS-Windows installer skips syntax/shared.
Solution:   Use "File /r" in the installer script. (Ken Takata, closes #10972)

diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index d71cffb8b0252b49990492c6b62848bf5ac51cba..4d2479a516c26e24bd7d7053eea920b9ec490f78 100644 (file)
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -366,11 +366,7 @@ Section "$(str_section_exe)" id_section_exe
        File ${VIMTOOLS}\winpty-agent.exe
 
        SetOutPath $0\colors
-       File ${VIMRT}\colors\*.*
-       SetOutPath $0\colors\tools
-       File ${VIMRT}\colors\tools\*.*
-       SetOutPath $0\colors\lists
-       File ${VIMRT}\colors\lists\*.*
+       File /r ${VIMRT}\colors\*.*
 
        SetOutPath $0\compiler
        File ${VIMRT}\compiler\*.*
@@ -395,13 +391,7 @@ Section "$(str_section_exe)" id_section_exe
        File ${VIMRT}\plugin\*.*
 
        SetOutPath $0\autoload
-       File ${VIMRT}\autoload\*.*
-
-       SetOutPath $0\autoload\dist
-       File ${VIMRT}\autoload\dist\*.*
-
-       SetOutPath $0\autoload\xml
-       File ${VIMRT}\autoload\xml\*.*
+       File /r ${VIMRT}\autoload\*.*
 
        SetOutPath $0\import\dist
        File ${VIMRT}\import\dist\*.*
@@ -410,7 +400,7 @@ Section "$(str_section_exe)" id_section_exe
        File ${VIMSRC}\vim.ico
 
        SetOutPath $0\syntax
-       File ${VIMRT}\syntax\*.*
+       File /r ${VIMRT}\syntax\*.*
 
        SetOutPath $0\spell
        File ${VIMRT}\spell\*.txt

diff --git a/src/version.c b/src/version.c
index c46894d59d1c413546e96ae1f00fd075ce450dad..474cbcb9caeba495500802a1506246ae02bd04ab 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -731,6 +731,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    258,
 /**/
     257,
 /**/