Mercurial > vim

comparison src/os_unix.c @ 4248:beab15a2ef14 v7.3.875

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.875 Problem: Build problem with some combination of features. Solution: Use FEAT_XCLIPBOARD instead of FEAT_CLIPBOARD.
author Bram Moolenaar <bram@vim.org>
date Thu, 21 Mar 2013 22:53:50 +0100
parents 90d72df431e5
children bb3cfdb62607
comparison
equal deleted inserted replaced
4247:d2571e334983 4248:beab15a2ef14
4785 wait_pid = pid; 4785 wait_pid = pid;
4786 } 4786 }
4787 else 4787 else
4788 wait_pid = 0; 4788 wait_pid = 0;
4789 4789
4790 # if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) 4790 # if defined(FEAT_XCLIPBOARD) && defined(FEAT_X11)
4791 /* Handle any X events, e.g. serving the clipboard. */ 4791 /* Handle any X events, e.g. serving the clipboard. */
4792 clip_update(); 4792 clip_update();
4793 # endif 4793 # endif
4794 } 4794 }
4795 finished: 4795 finished:
4815 State = old_State; 4815 State = old_State;
4816 if (toshell_fd >= 0) 4816 if (toshell_fd >= 0)
4817 close(toshell_fd); 4817 close(toshell_fd);
4818 close(fromshell_fd); 4818 close(fromshell_fd);
4819 } 4819 }
4820 # if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) 4820 # if defined(FEAT_XCLIPBOARD) && defined(FEAT_X11)
4821 else 4821 else
4822 { 4822 {
4823 /* 4823 /*
4824 * Similar to the loop above, but only handle X events, no 4824 * Similar to the loop above, but only handle X events, no
4825 * I/O. 4825 * I/O.