# HG changeset patch
# User Romain Francoise <romain@orebokech.com>
# Date 1188403406 0
# Node ID 0ce482dc32a67845b60399a186fe02034eaaee9f
# Parent  176fd4c8d28a68d44837fd30ae82737e339f425a
(Fset_input_mode): Don't call `Fset_quit_char' if QUIT hasn't been
provided.

diff -r 176fd4c8d28a -r 0ce482dc32a6 src/ChangeLog
--- a/src/ChangeLog	Wed Aug 29 15:31:23 2007 +0000
+++ b/src/ChangeLog	Wed Aug 29 16:03:26 2007 +0000
@@ -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 -r 176fd4c8d28a -r 0ce482dc32a6 src/keyboard.c
--- a/src/keyboard.c	Wed Aug 29 15:31:23 2007 +0000
+++ b/src/keyboard.c	Wed Aug 29 16:03:26 2007 +0000
@@ -11319,7 +11319,8 @@
   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;
 }