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 97e35b9fd772d06c7736251ec1e66d88a2883549..9459aa1cf4b15e16da9775a691a7a683eb1ecca0 100644 (file)
--- 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 d7e07550d5ac9a35b9fe2e3b0e1a3dc422d1f7bf..f0d5e00deae1d2faa6caf5d5e607e2ca58a4041a 100644 (file)
--- 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,
 /**/