2 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index eb3c1feaa71..78d4bb3211e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-29  Romain Francoise  <romain@orebokech.com>
+
+        * keyboard.c (Fset_input_mode): Don't call `Fset_quit_char' if
+        QUIT hasn't been provided.
+
 2007-08-29  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * callproc.c (child_setup, getenv_internal): Use the
diff --git a/src/keyboard.c b/src/keyboard.c
index 95a4aecfe39..635db1eb597 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11319,7 +11319,8 @@ See also `current-input-mode'.  */)
   Fset_input_interrupt_mode (interrupt);
   Fset_output_flow_control (flow, Qnil);
   Fset_input_meta_mode (meta, Qnil);
-  Fset_quit_char (quit);
+  if (!NILP (quit))
+    Fset_quit_char (quit);
   return Qnil;
 }