From 95a513511835b017479a513664eeed6d8899fa0d Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 21 Mar 2013 22:53:50 +0100 Subject: updated for version 7.3.875 Problem: Build problem with some combination of features. Solution: Use FEAT_XCLIPBOARD instead of FEAT_CLIPBOARD. --- src/os_unix.c | 4 ++-- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) 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, /**/ -- cgit v1.2.1