(Fsingle_key_description): For an invalid char, retuen

"Invalid char code NNNNN".

diff --git a/src/ChangeLog b/src/ChangeLog
index 5ba3aa07a65ccbb13beb74136f32cc97a7c78923..8d1bb3cf193f1b9c0799135b19494844f179f8a7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-26  Kenichi Handa  <handa@m17n.org>
+
+       * keymap.c (Fsingle_key_description): For an invalid char, return
+       "Invalid char code NNNNN".
+
 2006-09-25  Chong Yidong  <cyd@stupidchicken.com>
 
        * callint.c (Fcall_interactively): Doc fix.

diff --git a/src/keymap.c b/src/keymap.c
index 2c6c5ef03c94788007c1dfa63424dc2dabb9aa35..9b36ec08b6d7b0d656d193c678710193c02257de 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2385,9 +2385,15 @@ around function keys and event symbols.  */)
       else
        SPLIT_CHAR (without_bits, charset, c1, c2);
 
-      if (charset
-         && CHAR_VALID_P (charset, 1)
-         && ((c1 == 0 && c2 == -1) || c2 == 0))
+      if (! CHAR_VALID_P (without_bits, 1))
+       {
+         char buf[256];
+
+         sprintf (buf, "Invalid char code %d", XINT (key));
+         return build_string (buf);
+       }
+      else if (charset
+              && ((c1 == 0 && c2 == -1) || c2 == 0))
        {
          /* Handle a generic character.  */
          Lisp_Object name;