summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ex_docmd.c3
-rw-r--r--src/version.c2
-rw-r--r--src/window.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index c6e00bec5..9f127ec72 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -397,6 +397,9 @@ static void ex_folddo(exarg_T *eap);
#if !defined(FEAT_X11) || !defined(FEAT_XCLIPBOARD)
# define ex_xrestore ex_ni
#endif
+#if !defined(FEAT_TEXT_PROP)
+# define ex_popupclear ex_ni
+#endif
/*
* Declare cmdnames[].
diff --git a/src/version.c b/src/version.c
index 5573f44e5..f8e1d45de 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1392,
+/**/
1391,
/**/
1390,
diff --git a/src/window.c b/src/window.c
index bed3d3fb7..4946a3ad3 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1363,7 +1363,7 @@ win_init_some(win_T *newp, win_T *oldp)
}
static int
-win_valid_popup(win_T *win)
+win_valid_popup(win_T *win UNUSED)
{
#ifdef FEAT_TEXT_PROP
win_T *wp;