comparison src/keyboard.c @ 83454:845a93c68e9a

Fix C-g during `make-network-process'. (Reported by Mark Plaksin.) * src/process.c (Fmake_network_process): Don't unrequest_sigio on modern systems. * src/keyboard.c (Fset_input_interrupt_mode): Cosmetic change. * src/sysdep.c (request_sigio): Make it a no-op if noninteractive. (unrequest_sigio): Make it a no-op if noninteractive. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-494
author Karoly Lorentey <lorentey@elte.hu>
date Wed, 11 Jan 2006 14:51:51 +0000
parents ce06f17e2bfe
children 8d8bc8469c77
comparison
equal deleted inserted replaced
83453:55e22205ba88 83454:845a93c68e9a
10739 Lisp_Object interrupt; 10739 Lisp_Object interrupt;
10740 { 10740 {
10741 int new_interrupt_input; 10741 int new_interrupt_input;
10742 #ifdef SIGIO 10742 #ifdef SIGIO
10743 /* Note SIGIO has been undef'd if FIONREAD is missing. */ 10743 /* Note SIGIO has been undef'd if FIONREAD is missing. */
10744 if (0
10745 #ifdef HAVE_X_WINDOWS 10744 #ifdef HAVE_X_WINDOWS
10746 || x_display_list != NULL 10745 if (x_display_list != NULL)
10747 #endif
10748 )
10749 { 10746 {
10750 /* When using X, don't give the user a real choice, 10747 /* When using X, don't give the user a real choice,
10751 because we haven't implemented the mechanisms to support it. */ 10748 because we haven't implemented the mechanisms to support it. */
10752 #ifdef NO_SOCK_SIGIO 10749 #ifdef NO_SOCK_SIGIO
10753 new_interrupt_input = 0; 10750 new_interrupt_input = 0;
10754 #else /* not NO_SOCK_SIGIO */ 10751 #else /* not NO_SOCK_SIGIO */
10755 new_interrupt_input = 1; 10752 new_interrupt_input = 1;
10756 #endif /* NO_SOCK_SIGIO */ 10753 #endif /* NO_SOCK_SIGIO */
10757 } 10754 }
10758 else 10755 else
10756 #endif
10759 new_interrupt_input = !NILP (interrupt); 10757 new_interrupt_input = !NILP (interrupt);
10760 #else /* not SIGIO */ 10758 #else /* not SIGIO */
10761 new_interrupt_input = 0; 10759 new_interrupt_input = 0;
10762 #endif /* not SIGIO */ 10760 #endif /* not SIGIO */
10763 10761
10785 start_polling (); 10783 start_polling ();
10786 #endif 10784 #endif
10787 } 10785 }
10788 return Qnil; 10786 return Qnil;
10789 } 10787 }
10790 10788
10791 DEFUN ("set-output-flow-control", Fset_output_flow_control, Sset_output_flow_control, 1, 2, 0, 10789 DEFUN ("set-output-flow-control", Fset_output_flow_control, Sset_output_flow_control, 1, 2, 0,
10792 doc: /* Enable or disable ^S/^Q flow control for output to TERMINAL. 10790 doc: /* Enable or disable ^S/^Q flow control for output to TERMINAL.
10793 If FLOW is non-nil, flow control is enabled and you cannot use C-s or 10791 If FLOW is non-nil, flow control is enabled and you cannot use C-s or
10794 C-q in key sequences. 10792 C-q in key sequences.
10795 10793