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
index 2440a0cc8fbeb43ea754cc16614a3b6016a49fc3..71d75cbc23a6049c9c0fb618aae87b323e2b89fe 100644 (file)
--- 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
index 03cf2d91e29eb605bd76abc0ced9a3e1a0797ff0..60d26c023c5be7317042446c360ff869c129775b 100644 (file)
--- 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 d6fc7d45e7b174ffbe6663ac56fffd7ea0dfc86c..b818813ff79effa845c2ee83297b69d273113adb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    904,
 /**/
     903,
 /**/