From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 21 Mar 2013 21:53:50 +0000 (+0100)
Subject: updated for version 7.3.875
X-Git-Tag: v7.3.875
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95a513511835b017479a513664eeed6d8899fa0d;p=vim

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
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
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    875,
 /**/
     874,
 /**/