# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1363902830 -3600
# Node ID beab15a2ef147b880bf7b5add269142b9af58317
# Parent  d2571e3349837fa049f6c624d5a33e381bfc428e
updated for version 7.3.875
Problem:    Build problem with some combination of features.
Solution:   Use FEAT_XCLIPBOARD instead of FEAT_CLIPBOARD.

diff --git a/src/os_unix.c b/src/os_unix.c
--- 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
--- 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,