aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan Nicolaescu2010-03-21 19:56:56 -0700
committerDan Nicolaescu2010-03-21 19:56:56 -0700
commitb70640642e488145f0277e4e80f38fecae741b9a (patch)
tree44fd291eac9706cd9f346db32fe9b5923b06df90 /src
parent0be96e3a14ddf6b5437adf5dc12b6abff44c3652 (diff)
downloademacs-b70640642e488145f0277e4e80f38fecae741b9a.tar.gz
emacs-b70640642e488145f0277e4e80f38fecae741b9a.zip
* keyboard.c (Fset_input_interrupt_mode): Remove code depending on NO_SOCK_SIGIO,
not used anymore.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/keyboard.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c65767d8fc4..ab47c2cab02 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12010-03-22 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * keyboard.c (Fset_input_interrupt_mode): Remove code depending on
4 NO_SOCK_SIGIO, not used anymore.
5
12010-03-21 Dan Nicolaescu <dann@ics.uci.edu> 62010-03-21 Dan Nicolaescu <dann@ics.uci.edu>
2 7
3 * m/vax.h (BSD_SYSTEM, BSD4_2): Remove conditionals, we only 8 * m/vax.h (BSD_SYSTEM, BSD4_2): Remove conditionals, we only
diff --git a/src/keyboard.c b/src/keyboard.c
index 48d39235e3f..6582af7f805 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11304,11 +11304,7 @@ See also `current-input-mode'. */)
11304 { 11304 {
11305 /* When using X, don't give the user a real choice, 11305 /* When using X, don't give the user a real choice,
11306 because we haven't implemented the mechanisms to support it. */ 11306 because we haven't implemented the mechanisms to support it. */
11307#ifdef NO_SOCK_SIGIO
11308 new_interrupt_input = 0;
11309#else /* not NO_SOCK_SIGIO */
11310 new_interrupt_input = 1; 11307 new_interrupt_input = 1;
11311#endif /* NO_SOCK_SIGIO */
11312 } 11308 }
11313 else 11309 else
11314#endif /* HAVE_X_WINDOWS */ 11310#endif /* HAVE_X_WINDOWS */