* src/keyboard.c (pending_malloc_warning): Add const to match

definition in alloc.c.
(Fset_input_interrupt_mode): Simplify #ifdefs.

2 files changed, 9 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7bfd266b4d8..bef5242c9cb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2010-11-15  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        * keyboard.c (pending_malloc_warning): Add const to match
+        definition in alloc.c.
+        (Fset_input_interrupt_mode): Simplify #ifdefs.
+
+2010-11-15  Dan Nicolaescu  <dann@ics.uci.edu>
+
         Clean up systty.h macros.
         * systty.h (EMACS_GET_TTY_PGRP, EMACS_SET_TTY_PGRP, EMACS_GET_TTY)
         (EMACS_SET_TTY): Remove unneeded abstraction, instead inline the
diff --git a/src/keyboard.c b/src/keyboard.c
index b9931d5f12d..017a4981b98 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -431,7 +431,7 @@ FILE *dribble;
 /* Nonzero if input is available.  */
 int input_pending;
 
-extern char *pending_malloc_warning;
+extern const char *pending_malloc_warning;
 
 /* Circular buffer for pre-read keyboard input.  */
 
@@ -11100,10 +11100,10 @@ See also `current-input-mode'.  */)
 #ifndef DOS_NT
       /* this causes startup screen to be restored and messes with the mouse */
       reset_all_sys_modes ();
-#endif
       interrupt_input = new_interrupt_input;
-#ifndef DOS_NT
       init_all_sys_modes ();
+#else
+      interrupt_input = new_interrupt_input;
 #endif
 
 #ifdef POLL_FOR_INPUT