diff options
| author | Kenichi Handa <handa@m17n.org> | 1997-02-27 11:15:29 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 1997-02-27 11:15:29 +0000 |
| commit | 74d28e554025a236df409e5c1352bb5b92d7884b (patch) | |
| tree | a3f2e1a9b9823894113a8488abb863b0d006d5c9 /src/category.h | |
| parent | 7bce92a6736c5d0da30a5f8c07e004d889ebd799 (diff) | |
(CATEGORY_SET): For a composite character, return
category set of the first component.
Diffstat (limited to 'src/category.h')
| -rw-r--r-- | src/category.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/category.h b/src/category.h index 723bdb023e..956c6284b3 100644 --- a/src/category.h +++ b/src/category.h @@ -98,18 +98,21 @@ extern Lisp_Object _temp_category_set; /* Return the category set of character C in the current category table. */ #ifdef __GNUC__ -#define CATEGORY_SET(c) \ - ({ Lisp_Object table = current_buffer->category_table; \ - Lisp_Object temp; \ - if (c < CHAR_TABLE_ORDINARY_SLOTS) \ - while (NILP (temp = XCHAR_TABLE (table)->contents[c]) \ - && NILP (temp = XCHAR_TABLE (table)->defalt)) \ - table = XCHAR_TABLE (table)->parent; \ - else \ - temp = Faref (table, c); \ +#define CATEGORY_SET(c) \ + ({ Lisp_Object table = current_buffer->category_table; \ + Lisp_Object temp; \ + if (c < CHAR_TABLE_ORDINARY_SLOTS) \ + while (NILP (temp = XCHAR_TABLE (table)->contents[c]) \ + && NILP (temp = XCHAR_TABLE (table)->defalt)) \ + table = XCHAR_TABLE (table)->parent; \ + else \ + temp = Faref (table, \ + COMPOSITE_CHAR_P (c) ? cmpchar_component (c, 0) : (c)); \ temp; }) #else -#define CATEGORY_SET(c) Faref (current_buffer->category_table, c) +#define CATEGORY_SET(c) \ + Faref (current_buffer->category_table, \ + COMPOSITE_CHAR_P (c) ? cmpchar_component (c, 0) : (c)) #endif /* Return the doc string of CATEGORY in category table TABLE. */ |