summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorK.Takata <kentkt@csc.jp>2022-08-24 18:08:00 +0100
committerBram Moolenaar <Bram@vim.org>2022-08-24 18:08:00 +0100
commit44b9abb150afdca557d8ff5af112d654e0d19e84 (patch)
treeec7e71af14f6af21f7ce0acfdabc9b7381908e70
parent7ea9fcb48dcdb07c9eb960ace3cc625fe7c685b2 (diff)
downloadvim-git-44b9abb150afdca557d8ff5af112d654e0d19e84.tar.gz
patch 9.0.0258: MS-Windows installer skips syntax/sharedv9.0.0258
Problem: MS-Windows installer skips syntax/shared. Solution: Use "File /r" in the installer script. (Ken Takata, closes #10972)
-rw-r--r--nsis/gvim.nsi16
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 13 deletions
diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index d71cffb8b..4d2479a51 100644
--- 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 c46894d59..474cbcb9c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -732,6 +732,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 258,
+/**/
257,
/**/
256,