0
0
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00

updated for version 7.3.875

Problem:    Build problem with some combination of features.
Solution:   Use FEAT_XCLIPBOARD instead of FEAT_CLIPBOARD.
This commit is contained in:
Bram Moolenaar
2013-03-21 22:53:50 +01:00
parent d0e2d94589
commit 95a5135118
2 changed files with 4 additions and 2 deletions

View File

@@ -4787,7 +4787,7 @@ mch_call_shell(cmd, options)
else else
wait_pid = 0; 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. */ /* Handle any X events, e.g. serving the clipboard. */
clip_update(); clip_update();
# endif # endif
@@ -4817,7 +4817,7 @@ finished:
close(toshell_fd); close(toshell_fd);
close(fromshell_fd); close(fromshell_fd);
} }
# if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) # if defined(FEAT_XCLIPBOARD) && defined(FEAT_X11)
else else
{ {
/* /*

View File

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