patch 8.2.4893: distributed import files are not installed

Problem:    Distributed import files are not installed.
Solution:   Add rules to Makefile and NSIS.

diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index f9b1790b171a3838add2c6f5dbcc7603b47f5f96..d71cffb8b0252b49990492c6b62848bf5ac51cba 100644 (file)
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -403,6 +403,9 @@ Section "$(str_section_exe)" id_section_exe
        SetOutPath $0\autoload\xml
        File ${VIMRT}\autoload\xml\*.*
 
+       SetOutPath $0\import\dist
+       File ${VIMRT}\import\dist\*.*
+
        SetOutPath $0\bitmaps
        File ${VIMSRC}\vim.ico
 
@@ -1044,6 +1047,7 @@ Section "un.$(str_unsection_exe)" id_unsection_exe
        RMDir /r $0\compiler
        RMDir /r $0\doc
        RMDir /r $0\ftplugin
+       RMDir /r $0\import
        RMDir /r $0\indent
        RMDir /r $0\macros
        RMDir /r $0\pack

diff --git a/src/Makefile b/src/Makefile
index 3a713d7a6f0c2ce925d348d1c8a8a0d9cc5e897d..d15e314efadde51f265e99a0d95e5762ec8b1bf3 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1052,6 +1052,7 @@ COLSUBDIR = /colors
 SYNSUBDIR = /syntax
 INDSUBDIR = /indent
 AUTOSUBDIR = /autoload
+IMPORTSUBDIR = /import
 PLUGSUBDIR = /plugin
 FTPLUGSUBDIR = /ftplugin
 LANGSUBDIR = /lang
@@ -1074,6 +1075,7 @@ PODIR = po
 ### SYNSUBLOC  location for syntax files
 ### INDSUBLOC  location for indent files
 ### AUTOSUBLOC location for standard autoload files
+### IMPORTSUBLOC location for standard import files
 ### PLUGSUBLOC location for standard plugin files
 ### FTPLUGSUBLOC  location for ftplugin files
 ### LANGSUBLOC location for language files
@@ -1096,6 +1098,7 @@ COLSUBLOC = $(VIMRTLOC)$(COLSUBDIR)
 SYNSUBLOC      = $(VIMRTLOC)$(SYNSUBDIR)
 INDSUBLOC      = $(VIMRTLOC)$(INDSUBDIR)
 AUTOSUBLOC     = $(VIMRTLOC)$(AUTOSUBDIR)
+IMPORTSUBLOC   = $(VIMRTLOC)$(IMPORTSUBDIR)
 PLUGSUBLOC     = $(VIMRTLOC)$(PLUGSUBDIR)
 FTPLUGSUBLOC   = $(VIMRTLOC)$(FTPLUGSUBDIR)
 LANGSUBLOC     = $(VIMRTLOC)$(LANGSUBDIR)
@@ -1200,6 +1203,9 @@ INDSOURCE = ../runtime/indent
 # Where to copy the standard plugin files from
 AUTOSOURCE = ../runtime/autoload
 
+# Where to copy the standard import files from
+IMPORTSOURCE = ../runtime/import
+
 # Where to copy the standard plugin files from
 PLUGSOURCE = ../runtime/plugin
 
@@ -1475,6 +1481,7 @@ DEST_COL = $(DESTDIR)$(COLSUBLOC)
 DEST_SYN = $(DESTDIR)$(SYNSUBLOC)
 DEST_IND = $(DESTDIR)$(INDSUBLOC)
 DEST_AUTO = $(DESTDIR)$(AUTOSUBLOC)
+DEST_IMPORT = $(DESTDIR)$(IMPORTSUBLOC)
 DEST_PLUG = $(DESTDIR)$(PLUGSUBLOC)
 DEST_FTP = $(DESTDIR)$(FTPLUGSUBLOC)
 DEST_LANG = $(DESTDIR)$(LANGSUBLOC)
@@ -2373,6 +2380,7 @@ installruntime: installrtbase installmacros installpack installtutor installspel
 installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(DEST_RT) \
                $(DEST_HELP) $(DEST_PRINT) $(DEST_COL) $(DEST_SYN) $(DEST_IND) \
                $(DEST_FTP) $(DEST_AUTO) $(DEST_AUTO)/dist $(DEST_AUTO)/xml \
+               $(DEST_IMPORT) $(DEST_IMPORT)/dist \
                $(DEST_PLUG) $(DEST_TUTOR) $(DEST_SPELL) $(DEST_COMP)
        -$(SHELL) ./installman.sh install $(DEST_MAN) "" $(INSTALLMANARGS)
 # Generate the help tags with ":helptags" to handle all languages.
@@ -2451,6 +2459,9 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(DEST_RT) \
        cd $(DEST_AUTO)/dist; chmod $(HELPMOD) *.vim
        cd $(AUTOSOURCE)/xml; $(INSTALL_DATA) *.vim $(DEST_AUTO)/xml
        cd $(DEST_AUTO)/xml; chmod $(HELPMOD) *.vim
+# install the standard import files
+       cd $(IMPORTSOURCE)/dist; $(INSTALL_DATA) *.vim $(DEST_IMPORT)/dist
+       cd $(DEST_IMPORT)/dist; chmod $(HELPMOD) *.vim
 # install the standard plugin files
        cd $(PLUGSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_PLUG)
        cd $(DEST_PLUG); chmod $(HELPMOD) *.vim README.txt
@@ -2686,7 +2697,8 @@ $(DESTDIR)$(exec_prefix) $(DEST_BIN) \
                $(DEST_PRINT) $(DEST_COL) $(DEST_SYN) $(DEST_IND) $(DEST_FTP) \
                $(DEST_LANG) $(DEST_KMAP) $(DEST_COMP) $(DEST_MACRO) \
                $(DEST_PACK) $(DEST_TOOLS) $(DEST_TUTOR) $(DEST_SPELL) \
-               $(DEST_AUTO) $(DEST_AUTO)/dist $(DEST_AUTO)/xml $(DEST_PLUG):
+               $(DEST_AUTO) $(DEST_AUTO)/dist $(DEST_AUTO)/xml \
+               $(DEST_IMPORT) $(DEST_IMPORT)/dist $(DEST_PLUG):
        $(MKDIR_P) $@
        -chmod $(DIRMOD) $@
 
@@ -2872,8 +2884,10 @@ uninstall_runtime:
        -rm -rf $(DEST_FTP)/*.vim $(DEST_FTP)/README.txt $(DEST_FTP)/logtalk.dict
        -rm -f $(DEST_AUTO)/*.vim $(DEST_AUTO)/README.txt
        -rm -f $(DEST_AUTO)/dist/*.vim $(DEST_AUTO)/xml/*.vim
+       -rm -f $(DEST_IMPORT)/dist/*.vim
        -rm -f $(DEST_PLUG)/*.vim $(DEST_PLUG)/README.txt
        -rmdir $(DEST_FTP) $(DEST_AUTO)/dist $(DEST_AUTO)/xml $(DEST_AUTO)
+       -rmdir $(DEST_IMPORT)/dist $(DEST_IMPORT)
        -rmdir $(DEST_PLUG) $(DEST_RT)
 #      This will fail when other Vim versions are installed, no worries.
        -rmdir $(DEST_VIM)

diff --git a/src/version.c b/src/version.c
index 3957325da5831cafe063dd815ad7240d54867526..a99bede085fbf38caf2f8280fc5edaa9c3774486 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4893,
 /**/
     4892,
 /**/