From: Paul Eggert Date: Thu, 22 Aug 2013 18:29:51 +0000 (-0700) Subject: * process.c (flush_pending_output): Remove stub. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1686^2~150 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2649579468273544ead2ed1c16b224a75ec3a895;p=emacs.git * process.c (flush_pending_output): Remove stub. All uses removed. --- diff --git a/src/ChangeLog b/src/ChangeLog index 8983b6abd64..ebd41a61203 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-08-22 Paul Eggert + + * process.c (flush_pending_output): Remove stub. + All uses removed. + 2013-08-21 Paul Eggert * callproc.c: Fix race that killed background processes (Bug#15144). diff --git a/src/lisp.h b/src/lisp.h index e6e90e1e968..ea8b7e3474e 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -4100,7 +4100,6 @@ extern void init_sys_modes (struct tty_display_info *); extern void reset_sys_modes (struct tty_display_info *); extern void init_all_sys_modes (void); extern void reset_all_sys_modes (void); -extern void flush_pending_output (int) ATTRIBUTE_CONST; extern void child_setup_tty (int); extern void setup_pty (int); extern int set_window_size (int, int, int); diff --git a/src/process.c b/src/process.c index 349ec26534b..75cb590fc57 100644 --- a/src/process.c +++ b/src/process.c @@ -3846,15 +3846,12 @@ deactivate_process (Lisp_Object proc) } #endif - inchannel = p->infd; - /* Beware SIGCHLD hereabouts. */ - if (inchannel >= 0) - flush_pending_output (inchannel); for (i = 0; i < PROCESS_OPEN_FDS; i++) close_process_fd (&p->open_fd[i]); + inchannel = p->infd; if (inchannel >= 0) { p->infd = -1; @@ -5785,10 +5782,9 @@ process_send_signal (Lisp_Object process, int signo, Lisp_Object current_group, return; } - switch (signo) - { #ifdef SIGCONT - case SIGCONT: + if (signo == SIGCONT) + { p->raw_status_new = 0; pset_status (p, Qrun); p->tick = ++process_tick; @@ -5797,14 +5793,8 @@ process_send_signal (Lisp_Object process, int signo, Lisp_Object current_group, status_notify (NULL); redisplay_preserve_echo_area (13); } - break; -#endif /* ! defined (SIGCONT) */ - case SIGINT: - case SIGQUIT: - case SIGKILL: - flush_pending_output (p->infd); - break; } +#endif /* If we don't have process groups, send the signal to the immediate subprocess. That isn't really right, but it's better than any diff --git a/src/sysdep.c b/src/sysdep.c index 201ba9d104d..78e3d908cfe 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -337,16 +337,6 @@ child_status_changed (pid_t child, int *status, int options) return get_child_status (child, status, WNOHANG | options, 0); } -/* - * flush any pending output - * (may flush input as well; it does not matter the way we use it) - */ - -void -flush_pending_output (int channel) -{ - /* FIXME: maybe this function should be removed */ -} /* Set up the terminal at the other end of a pseudo-terminal that we will be controlling an inferior through.