summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/os_unix.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index 97e35b9fd..9459aa1cf 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4787,7 +4787,7 @@ mch_call_shell(cmd, options)
else
wait_pid = 0;
-# if defined(FEAT_CLIPBOARD) && defined(FEAT_X11)
+# if defined(FEAT_XCLIPBOARD) && defined(FEAT_X11)
/* Handle any X events, e.g. serving the clipboard. */
clip_update();
# endif
@@ -4817,7 +4817,7 @@ finished:
close(toshell_fd);
close(fromshell_fd);
}
-# if defined(FEAT_CLIPBOARD) && defined(FEAT_X11)
+# if defined(FEAT_XCLIPBOARD) && defined(FEAT_X11)
else
{
/*
diff --git a/src/version.c b/src/version.c
index d7e07550d..f0d5e00de 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 */
/**/
+ 875,
+/**/
874,
/**/
873,