To: vim_dev@googlegroups.com Subject: Patch 8.2.4893 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4893 (after 8.2.4891) Problem: Distributed import files are not installed. Solution: Add rules to Makefile and NSIS. Files: src/Makefile, nsis/gvim.nsi *** ../vim-8.2.4892/src/Makefile 2022-04-03 18:01:39.647574472 +0100 --- src/Makefile 2022-05-06 18:06:27.912699701 +0100 *************** *** 1052,1057 **** --- 1052,1058 ---- SYNSUBDIR = /syntax INDSUBDIR = /indent AUTOSUBDIR = /autoload + IMPORTSUBDIR = /import PLUGSUBDIR = /plugin FTPLUGSUBDIR = /ftplugin LANGSUBDIR = /lang *************** *** 1074,1079 **** --- 1075,1081 ---- ### 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,1101 **** --- 1098,1104 ---- SYNSUBLOC = $(VIMRTLOC)$(SYNSUBDIR) INDSUBLOC = $(VIMRTLOC)$(INDSUBDIR) AUTOSUBLOC = $(VIMRTLOC)$(AUTOSUBDIR) + IMPORTSUBLOC = $(VIMRTLOC)$(IMPORTSUBDIR) PLUGSUBLOC = $(VIMRTLOC)$(PLUGSUBDIR) FTPLUGSUBLOC = $(VIMRTLOC)$(FTPLUGSUBDIR) LANGSUBLOC = $(VIMRTLOC)$(LANGSUBDIR) *************** *** 1200,1205 **** --- 1203,1211 ---- # 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,1480 **** --- 1481,1487 ---- 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,2378 **** --- 2380,2386 ---- 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,2456 **** --- 2459,2467 ---- 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,2692 **** $(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): $(MKDIR_P) $@ -chmod $(DIRMOD) $@ --- 2697,2704 ---- $(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_IMPORT) $(DEST_IMPORT)/dist $(DEST_PLUG): $(MKDIR_P) $@ -chmod $(DIRMOD) $@ *************** *** 2872,2879 **** --- 2884,2893 ---- -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) *** ../vim-8.2.4892/nsis/gvim.nsi 2022-03-11 15:23:25.762808841 +0000 --- nsis/gvim.nsi 2022-05-06 18:04:15.152690861 +0100 *************** *** 403,408 **** --- 403,411 ---- SetOutPath $0\autoload\xml File ${VIMRT}\autoload\xml\*.* + SetOutPath $0\import\dist + File ${VIMRT}\import\dist\*.* + SetOutPath $0\bitmaps File ${VIMSRC}\vim.ico *************** *** 1044,1049 **** --- 1047,1053 ---- 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 *** ../vim-8.2.4892/src/version.c 2022-05-06 17:53:02.689329537 +0100 --- src/version.c 2022-05-06 18:03:08.564751824 +0100 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 4893, /**/ -- hundred-and-one symptoms of being an internet addict: 119. You are reading a book and look for the scroll bar to get to the next page. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///