summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-03-21 22:53:50 +0100
committerBram Moolenaar <Bram@vim.org>2013-03-21 22:53:50 +0100
commit95a513511835b017479a513664eeed6d8899fa0d (patch)
tree7bab18cbb90481559d37dd1b47027f1b191ce6a7
parentd0e2d94589d11cad514d1d66ade76d497e9d7567 (diff)
updated for version 7.3.875v7.3.875
Problem: Build problem with some combination of features. Solution: Use FEAT_XCLIPBOARD instead of FEAT_CLIPBOARD.
-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 97e35b9fd7..9459aa1cf4 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 d7e07550d5..f0d5e00dea 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,