# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1446465604 -3600
# Node ID 0b4387f570ecb8c6629eefcca7430fc09199c96b
# Parent  3ba0f29ba1d1239378c3f400ac49ecf20a05202a
commit https://github.com/vim/vim/commit/6407b3e80d7d7f8f0797c13ae35cc06f96be46c9
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Nov 2 12:50:55 2015 +0100

    patch 7.4.904
    Problem:    Vim does not provide .desktop files.
    Solution:   Include and install .desktop files. (James McCoy, closes #455)

diff --git a/Filelist b/Filelist
--- a/Filelist
+++ b/Filelist
@@ -584,6 +584,8 @@ RT_UNIX =	\
 		runtime/vim32x32.xpm \
 		runtime/vim48x48.png \
 		runtime/vim48x48.xpm \
+		runtime/gvim.desktop \
+		runtime/vim.desktop \
 
 # Unix and DOS runtime without CR-LF translation
 RT_UNIX_DOS_BIN =	\
diff --git a/src/Makefile b/src/Makefile
--- 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
--- 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,