patch 7.4.1556
Problem: "make install" changes the help tags file, causing it to differ
from the repository.
Solution: Move it aside and restore it.
diff --git a/src/Makefile b/src/Makefile
index 2b17db5..a52a1f3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2112,6 +2112,9 @@
-$(SHELL) ./installman.sh install $(DEST_MAN) "" $(INSTALLMANARGS)
@echo generating help tags
# Generate the help tags with ":helptags" to handle all languages.
+# Move the distributed tags file aside and restore it, to avoid it being
+# different from the repository.
+ cd $(HELPSOURCE); mv -f tags tags.dist
-@cd $(HELPSOURCE); $(MAKE) VIMEXE=$(DEST_BIN)/$(VIMTARGET) vimtags
cd $(HELPSOURCE); \
files=`ls *.txt tags`; \
@@ -2121,6 +2124,7 @@
chmod $(HELPMOD) $$files
$(INSTALL_DATA) $(HELPSOURCE)/*.pl $(DEST_HELP)
chmod $(SCRIPTMOD) $(DEST_HELP)/*.pl
+ cd $(HELPSOURCE); mv -f tags.dist tags
# install the menu files
$(INSTALL_DATA) $(SCRIPTSOURCE)/menu.vim $(SYS_MENU_FILE)
chmod $(VIMSCRIPTMOD) $(SYS_MENU_FILE)
diff --git a/src/version.c b/src/version.c
index 38d89c1..9c15aaf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1556,
+/**/
1555,
/**/
1554,
