# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1457876704 -3600
# Node ID 3de84783c0291b3af4b2b4ed3c2d0cd10784ea58
# Parent  ac50d63008fdd1030c1238fe640e99cb58b4d4a8
commit https://github.com/vim/vim/commit/a3442cb5056ca62fc71fa03f68a9395e4391caf4
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Mar 13 14:34:12 2016 +0100

    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
--- a/src/Makefile
+++ b/src/Makefile
@@ -2112,6 +2112,9 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DES
 	-$(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 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DES
 		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
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1556,
+/**/
     1555,
 /**/
     1554,