diff options
| author | Bram Moolenaar <bram@vim.org> | 2013-03-21 22:53:50 +0100 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2013-03-21 22:53:50 +0100 |
| commit | 253d1b190f73a7f464d15a5f8c3b67e7c60106d1 (patch) | |
| tree | 74c41d9b9629d999c90ef588d4f3f98a9cc2b472 | |
| parent | 28cca1b44cc1a594ae5070b6d9c0e1fa995c5220 (diff) | |
| download | vim-253d1b190f73a7f464d15a5f8c3b67e7c60106d1.tar.gz | |
Problem: Build problem with some combination of features.
Solution: Use FEAT_XCLIPBOARD instead of FEAT_CLIPBOARD.
| -rw-r--r-- | src/os_unix.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 97e35b9f..9459aa1c 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 d7e07550..f0d5e00d 100644 --- 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, |