updated for version 7.3.875

Problem: Build problem with some combination of features. Solution: Use FEAT_XCLIPBOARD instead of FEAT_CLIPBOARD.
vim · Mar 21, 2013 · 95a5135 · 95a5135
1 parent d0e2d94
commit 95a5135
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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 @@ mch_call_shell(cmd, options)
 		    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
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    875,
 /**/
     874,
 /**/