Merge from trunk.

4 files changed, 34 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 46c22caeea9..fb0057770e6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-10-24  Paul Eggert  <eggert@cs.ucla.edu>
+2011-10-25  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix integer width and related bugs.
         * alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp):
@@ -788,6 +788,20 @@
         rather than rolling our own approximation.
         (SCROLL_BAR_VEC_SIZE): Remove; not used.
 
+2011-10-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * dispextern.h (Fcontrolling_tty_p): New decl (Bug#6649 part 2).
+
+2011-10-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keyboard.c (test_undefined): New function (bug#9751).
+        (read_key_sequence): Use it to detect when a key is bound to `undefined'.
+
+2011-10-25  Enami Tsugutomo  <tsugutomo.enami@jp.sony.com>
+
+        * sysdep.c (init_sys_modes): Fix the check for the controlling
+        terminal (Bug#6649).
+
 2011-10-20  Eli Zaretskii  <eliz@gnu.org>
 
         * dispextern.h (struct bidi_it): New member next_en_type.
diff --git a/src/dispextern.h b/src/dispextern.h
index 5f2c844b58d..b1c3d6237c9 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3346,6 +3346,7 @@ extern int tty_capable_p (struct tty_display_info *, unsigned, unsigned long, un
 extern void set_tty_color_mode (struct tty_display_info *, struct frame *);
 extern struct terminal *get_named_tty (const char *);
 EXFUN (Ftty_type, 1);
+EXFUN (Fcontrolling_tty_p, 1);
 extern void create_tty_output (struct frame *);
 extern struct terminal *init_tty (const char *, const char *, int);
 extern void tty_append_glyph (struct it *);
diff --git a/src/keyboard.c b/src/keyboard.c
index 3ff0e82440b..f5a3ef07829 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8907,6 +8907,14 @@ keyremap_step (Lisp_Object *keybuf, int bufsize, volatile keyremap *fkey,
   return 0;
 }
 
+static int
+test_undefined (Lisp_Object binding)
+{
+  return (EQ (binding, Qundefined)
+          || (!NILP (binding) && SYMBOLP (binding)
+              && EQ (Fcommand_remapping (binding, Qnil, Qnil), Qundefined)));
+}
+
 /* Read a sequence of keys that ends with a non prefix character,
    storing it in KEYBUF, a buffer of size BUFSIZE.
    Prompt with PROMPT.
@@ -9857,7 +9865,9 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
             }
         }
 
-      if (first_binding < nmaps && NILP (submaps[first_binding])
+      if (first_binding < nmaps
+          && NILP (submaps[first_binding])
+          && !test_undefined (defs[first_binding])
           && indec.start >= t)
         /* There is a binding and it's not a prefix.
            (and it doesn't have any input-decode-map translation pending).
@@ -9884,7 +9894,9 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
                                   /* If there's a binding (i.e.
                                      first_binding >= nmaps) we don't want
                                      to apply this function-key-mapping.  */
-                                  fkey.end + 1 == t && first_binding >= nmaps,
+                                  fkey.end + 1 == t
+                                  && (first_binding >= nmaps
+                                      || test_undefined (defs[first_binding])),
                                   &diff, prompt);
             UNGCPRO;
             if (done)
diff --git a/src/sysdep.c b/src/sysdep.c
index d2ce5a8cc1b..efc627e80b7 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -854,6 +854,7 @@ void
 init_sys_modes (struct tty_display_info *tty_out)
 {
   struct emacs_tty tty;
+  Lisp_Object terminal;
 
   Vtty_erase_char = Qnil;
 
@@ -907,7 +908,9 @@ init_sys_modes (struct tty_display_info *tty_out)
       tty.main.c_cflag &= ~PARENB;/* Don't check parity */
     }
 #endif
-  if (tty_out->input == stdin)
+
+  XSETTERMINAL(terminal, tty_out->terminal);
+  if (!NILP (Fcontrolling_tty_p (terminal)))
     {
       tty.main.c_cc[VINTR] = quit_char; /* C-g (usually) gives SIGINT */
       /* Set up C-g for both SIGQUIT and SIGINT.