From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Mon, 15 Nov 2010 06:18:50 +0000 (-0800)
Subject: * src/keyboard.c (pending_malloc_warning): Add const to match
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~239
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c2f0866a23215457de561c2f10cebedb5c6aa38b;p=emacs.git

* src/keyboard.c (pending_malloc_warning): Add const to match
definition in alloc.c.
(Fset_input_interrupt_mode): Simplify #ifdefs.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 7bfd266b4d8..bef5242c9cb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+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.
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