Mercurial > vim
diff src/os_unix.c @ 8281:74b15ed0a259 v7.4.1433
commit https://github.com/vim/vim/commit/85b11769ab507c7df93f319fd964fa579701b76b
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Feb 27 18:13:23 2016 +0100
patch 7.4.1433
Problem: The Sniff interface is no longer useful, the tool has not been
available for may years.
Solution: Delete the Sniff interface and related code.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 27 Feb 2016 18:15:07 +0100 |
| parents | 989ac3aed1ef |
| children | d44ff1525ff0 |
line wrap: on
line diff
--- a/src/os_unix.c +++ b/src/os_unix.c @@ -5340,7 +5340,6 @@ WaitForChar(long msec) * "msec" == 0 will check for characters once. * "msec" == -1 will block until a character is available. * When a GUI is being used, this will not be used for input -- webb - * Returns also, when a request from Sniff is waiting -- toni. * Or when a Linux GPM mouse event is waiting. * Or when a clientserver message is on the queue. */ @@ -5427,15 +5426,6 @@ RealWaitForChar(int fd, long msec, int * fds[0].events = POLLIN; nfd = 1; -# ifdef FEAT_SNIFF -# define SNIFF_IDX 1 - if (want_sniff_request) - { - fds[SNIFF_IDX].fd = fd_from_sniff; - fds[SNIFF_IDX].events = POLLIN; - nfd++; - } -# endif # ifdef FEAT_XCLIPBOARD may_restore_clipboard(); if (xterm_Shell != (Widget)0) @@ -5478,17 +5468,6 @@ RealWaitForChar(int fd, long msec, int * finished = FALSE; # endif -# ifdef FEAT_SNIFF - if (ret < 0) - sniff_disconnect(1); - else if (want_sniff_request) - { - if (fds[SNIFF_IDX].revents & POLLHUP) - sniff_disconnect(1); - if (fds[SNIFF_IDX].revents & POLLIN) - sniff_request_waiting = 1; - } -# endif # ifdef FEAT_XCLIPBOARD if (xterm_Shell != (Widget)0 && (fds[xterm_idx].revents & POLLIN)) { @@ -5574,15 +5553,6 @@ select_eintr: # endif maxfd = fd; -# ifdef FEAT_SNIFF - if (want_sniff_request) - { - FD_SET(fd_from_sniff, &rfds); - FD_SET(fd_from_sniff, &efds); - if (maxfd < fd_from_sniff) - maxfd = fd_from_sniff; - } -# endif # ifdef FEAT_XCLIPBOARD may_restore_clipboard(); if (xterm_Shell != (Widget)0) @@ -5652,17 +5622,6 @@ select_eintr: finished = FALSE; # endif -# ifdef FEAT_SNIFF - if (ret < 0 ) - sniff_disconnect(1); - else if (ret > 0 && want_sniff_request) - { - if (FD_ISSET(fd_from_sniff, &efds)) - sniff_disconnect(1); - if (FD_ISSET(fd_from_sniff, &rfds)) - sniff_request_waiting = 1; - } -# endif # ifdef FEAT_XCLIPBOARD if (ret > 0 && xterm_Shell != (Widget)0 && FD_ISSET(ConnectionNumber(xterm_dpy), &rfds))