updated for version 7.3.985

Problem:    GTK vim not started as gvim doesn't set WM_CLASS property to a
            useful value.
Solution:   Call g_set_prgname() on startup. (James McCoy)

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index ceade7526f2cdc0599bc760f95b49b6837efac26..853947c1bbbbf742df9bc4428204fa52ac3ca8fe 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -1447,6 +1447,11 @@ gui_mch_init_check(void)
        using_gnome = 1;
 #endif
 
+    /* This defaults to argv[0], but we want it to match the name of the
+     * shipped gvim.desktop so that Vim's windows can be associated with this
+     * file. */
+    g_set_prgname("gvim");
+
     /* Don't use gtk_init() or gnome_init(), it exits on failure. */
     if (!gtk_init_check(&gui_argc, &gui_argv))
     {

diff --git a/src/version.c b/src/version.c
index 52d9e71914e1bcd0c49ddeac6416335d2f846684..e74f2d1b0544066952c1abb545ca56e40e0009d9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    985,
 /**/
     984,
 /**/