[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/keymap.c,v
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/src/keymap.c,v |
Date: |
Mon, 25 Sep 2006 02:51:13 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kenichi Handa <handa> 06/09/25 02:51:13
Index: keymap.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/keymap.c,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -b -r1.336 -r1.337
--- keymap.c 23 Sep 2006 05:37:18 -0000 1.336
+++ keymap.c 25 Sep 2006 02:51:13 -0000 1.337
@@ -2386,15 +2386,22 @@
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
{
- [Emacs-diffs] Changes to emacs/src/keymap.c,v, Chong Yidong, 2006/09/10
- [Emacs-diffs] Changes to emacs/src/keymap.c,v, Kim F. Storm, 2006/09/11
- [Emacs-diffs] Changes to emacs/src/keymap.c,v, Chong Yidong, 2006/09/11
- [Emacs-diffs] Changes to emacs/src/keymap.c,v, David Kastrup, 2006/09/15
- [Emacs-diffs] Changes to emacs/src/keymap.c,v, Stefan Monnier, 2006/09/19
- [Emacs-diffs] Changes to emacs/src/keymap.c,v, Kenichi Handa, 2006/09/23
- [Emacs-diffs] Changes to emacs/src/keymap.c,v,
Kenichi Handa <=
- [Emacs-diffs] Changes to emacs/src/keymap.c,v, Kenichi Handa, 2006/09/25
- [Emacs-diffs] Changes to emacs/src/keymap.c,v, Kenichi Handa, 2006/09/26
- [Emacs-diffs] Changes to emacs/src/keymap.c,v, Stefan Monnier, 2006/09/28