Merge remote-tracking branch 'vim/master'

This commit is contained in:
Kazuki Sakamoto
2018-05-02 21:26:34 -07:00
2 changed files with 5 additions and 2 deletions
+3 -2
View File
@@ -2490,8 +2490,9 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(DEST_RT) \
cd $(PRINTSOURCE); $(INSTALL_DATA) *.ps $(DEST_PRINT)
cd $(DEST_PRINT); chmod $(FILEMOD) *.ps
# install the colorscheme files
cd $(COLSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_COL)
cd $(DEST_COL); chmod $(HELPMOD) *.vim README.txt
cd $(COLSOURCE); $(INSTALL_DATA_R) *.vim tools README.txt $(DEST_COL)
cd $(DEST_COL); chmod $(DIRMOD) tools
cd $(DEST_COL); chmod $(HELPMOD) *.vim README.txt tools/*.vim
# install the syntax files
cd $(SYNSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_SYN)
cd $(DEST_SYN); chmod $(HELPMOD) *.vim README.txt
+2
View File
@@ -776,6 +776,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1788,
/**/
1787,
/**/