Commit 173517c6 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(Fsingle_key_description): Return unique names for

generic characters.
parent 86b1704f
2006-09-25 Kenichi Handa <handa@m17n.org>
* keymap.c (Fsingle_key_description): Return unique names for
generic characters.
2006-09-24 Richard Stallman <rms@gnu.org>
 
* search.c (compile_pattern_1): Don't BLOCK_INPUT.
......
......@@ -2386,15 +2386,22 @@ around function keys and event symbols. */)
SPLIT_CHAR (without_bits, charset, c1, c2);
if (charset
&& CHARSET_DEFINED_P (charset)
&& ((c1 >= 0 && c1 < 32)
|| (c2 >= 0 && c2 < 32)))
&& CHAR_VALID_P (charset, 1)
&& (c1 == 0 || c2 == 0))
{
/* Handle a generic character. */
Lisp_Object name;
name = CHARSET_TABLE_INFO (charset, CHARSET_LONG_NAME_IDX);
char buf[256];
name = CHARSET_TABLE_INFO (charset, CHARSET_SHORT_NAME_IDX);
CHECK_STRING (name);
return concat2 (build_string ("Character set "), name);
if (c1 == 0)
/* Only a charset is specified. */
sprintf (buf, "Generic char %d: all of ", without_bits);
else
/* 1st code-point of 2-dimensional charset is specified. */
sprintf (buf, "Generic char %d: row %d of ", without_bits, c1);
return concat2 (build_string (buf), name);
}
else
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment