summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui_gtk_x11.c5
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index ceade7526f..853947c1bb 100644
--- 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 52d9e71914..e74f2d1b05 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 985,
+/**/
984,
/**/
983,