summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-04-22 12:24:52 +0200
committerBram Moolenaar <Bram@vim.org>2016-04-22 12:24:52 +0200
commit763b684373bf5954445d8d8d99da1e39a4fc5105 (patch)
tree9151542f12d2c3f1c5c8487a086175b85ad27402
parent902647d2dfb42dce8449dfbbc22dab27a528744d (diff)
downloadvim-git-763b684373bf5954445d8d8d99da1e39a4fc5105.tar.gz
patch 7.4.1775v7.4.1775
Problem: The rgb.txt file is not installed. Solution: Install the file. (Christian Brabandt)
-rw-r--r--src/Makefile6
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/Makefile b/src/Makefile
index 716dae701..f0f892b10 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1076,6 +1076,9 @@ SYS_DELMENU_FILE = $(DESTDIR)$(SCRIPTLOC)/delmenu.vim
### Name of the bugreport file target.
SYS_BUGR_FILE = $(DESTDIR)$(SCRIPTLOC)/bugreport.vim
+### Name of the rgb.txt file target.
+SYS_RGB_FILE = $(DESTDIR)$(SCRIPTLOC)/rgb.txt
+
### Name of the file type detection file target.
SYS_FILETYPE_FILE = $(DESTDIR)$(SCRIPTLOC)/filetype.vim
@@ -2167,6 +2170,9 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(DEST_RT) \
chmod $(VIMSCRIPTMOD) $(MSWIN_FILE)
$(INSTALL_DATA) $(SCRIPTSOURCE)/evim.vim $(EVIM_FILE)
chmod $(VIMSCRIPTMOD) $(EVIM_FILE)
+# install the rgb.txt file
+ $(INSTALL_DATA) $(SCRIPTSOURCE)/rgb.txt $(SYS_RGB_FILE)
+ chmod $(VIMSCRIPTMOD) $(SYS_RGB_FILE)
# install the bugreport file
$(INSTALL_DATA) $(SCRIPTSOURCE)/bugreport.vim $(SYS_BUGR_FILE)
chmod $(VIMSCRIPTMOD) $(SYS_BUGR_FILE)
diff --git a/src/version.c b/src/version.c
index 3c5f94ec5..2d0abebd6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1775,
+/**/
1774,
/**/
1773,