summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-09-29 20:53:55 +0200
committerBram Moolenaar <Bram@vim.org>2019-09-29 20:53:55 +0200
commitd17a57a43330977b8f4eb36f1f7a4a66a7bb26c8 (patch)
treeff5c85e4f53fef46d514113a0222b10da563ec82
parentac02a638b4ae2f019b448bf82bf2667e75ff939e (diff)
patch 8.1.2102: can't build with GTK and FEAT_GUI_GNOMEv8.1.2102
Problem: Can't build with GTK and FEAT_GUI_GNOME. (Tony Mechelynck) Solution: Adjust the #ifdef. (Yegappan Lakshmanan)
-rw-r--r--src/session.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/session.c b/src/session.c
index 41835db263..418fcba577 100644
--- a/src/session.c
+++ b/src/session.c
@@ -985,7 +985,7 @@ ex_loadview(exarg_T *eap)
}
}
-# if defined(USE_GNOME_SESSION) \
+# if defined(FEAT_GUI_GNOME) \
|| (defined(GUI_MAY_SPAWN) && defined(EXPERIMENTAL_GUI_CMD)) \
|| defined(PROTO)
/*
diff --git a/src/version.c b/src/version.c
index 8feb2cc72c..f5b9d6075e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2102,
+/**/
2101,
/**/
2100,