summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-11-02 12:50:55 +0100
committerBram Moolenaar <Bram@vim.org>2015-11-02 12:50:55 +0100
commit6407b3e80d7d7f8f0797c13ae35cc06f96be46c9 (patch)
tree591e91382279f9cd64fbdab2a7fe10505a0b8ea0 /src
parentd7464be9747fcaa8e6210e1f00a3882932df76e2 (diff)
downloadvim-git-6407b3e80d7d7f8f0797c13ae35cc06f96be46c9.tar.gz
patch 7.4.904v7.4.904
Problem: Vim does not provide .desktop files. Solution: Include and install .desktop files. (James McCoy, closes #455)
Diffstat (limited to 'src')
-rw-r--r--src/Makefile5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index 03cf2d91e..60d26c023 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1905,10 +1905,12 @@ test1 \
test_autocmd_option \
test_autoformat_join \
test_breakindent \
+ test_cdo \
test_changelist \
test_charsearch \
test_close_count \
test_command_count \
+ test_comparators \
test_erasebackword \
test_eval \
test_fixeol \
@@ -2225,7 +2227,8 @@ install-icons:
-a ! -f $(ICON16PATH)/gvim.png; then \
$(INSTALL_DATA) $(SCRIPTSOURCE)/vim16x16.png $(ICON16PATH)/gvim.png; \
fi
-
+ $(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop $(SCRIPTSOURCE)/gvim.desktop \
+ $(DESTDIR)$(DATADIR)/applications
$(HELPSOURCE)/vim.1 $(MACROSOURCE) $(TOOLSSOURCE):
@echo Runtime files not found.
diff --git a/src/version.c b/src/version.c
index d6fc7d45e..b818813ff 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 904,
+/**/
903,
/**/
902,