diff options
| author | Kenichi Handa | 2008-11-27 07:59:35 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2008-11-27 07:59:35 +0000 |
| commit | 55870ffc30547ff5dacd37db45fed4b38a0dd7e6 (patch) | |
| tree | 38077594d690ddb73fc35e652ba612076d5e6be1 /src | |
| parent | cd486875776635d52c854f41863011f16291b82a (diff) | |
| download | emacs-55870ffc30547ff5dacd37db45fed4b38a0dd7e6.tar.gz emacs-55870ffc30547ff5dacd37db45fed4b38a0dd7e6.zip | |
(MAYBE_UNIFY_CHAR): Call maybe_unify_char instead of
Funify_charset.
Diffstat (limited to 'src')
| -rw-r--r-- | src/character.h | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/src/character.h b/src/character.h index 44b8b29101a..34e696e5083 100644 --- a/src/character.h +++ b/src/character.h | |||
| @@ -574,26 +574,18 @@ extern char unibyte_has_multibyte_table[256]; | |||
| 574 | /* If C is a character to be unified with a Unicode character, return | 574 | /* If C is a character to be unified with a Unicode character, return |
| 575 | the unified Unicode character. */ | 575 | the unified Unicode character. */ |
| 576 | 576 | ||
| 577 | #define MAYBE_UNIFY_CHAR(c) \ | 577 | #define MAYBE_UNIFY_CHAR(c) \ |
| 578 | if (c > MAX_UNICODE_CHAR \ | 578 | do { \ |
| 579 | && CHAR_TABLE_P (Vchar_unify_table)) \ | 579 | if (c > MAX_UNICODE_CHAR && c <= MAX_5_BYTE_CHAR) \ |
| 580 | { \ | 580 | { \ |
| 581 | Lisp_Object val; \ | 581 | Lisp_Object val; \ |
| 582 | int unified; \ | 582 | val = CHAR_TABLE_REF (Vchar_unify_table, c); \ |
| 583 | \ | 583 | if (INTEGERP (val)) \ |
| 584 | val = CHAR_TABLE_REF (Vchar_unify_table, c); \ | 584 | c = XINT (val); \ |
| 585 | if (! NILP (val)) \ | 585 | else if (! NILP (val)) \ |
| 586 | { \ | 586 | c = maybe_unify_char (c, val); \ |
| 587 | if (SYMBOLP (val)) \ | 587 | } \ |
| 588 | { \ | 588 | } while (0) |
| 589 | Funify_charset (val, Qnil, Qnil); \ | ||
| 590 | val = CHAR_TABLE_REF (Vchar_unify_table, c); \ | ||
| 591 | } \ | ||
| 592 | if ((unified = XINT (val)) >= 0) \ | ||
| 593 | c = unified; \ | ||
| 594 | } \ | ||
| 595 | } \ | ||
| 596 | else | ||
| 597 | 589 | ||
| 598 | 590 | ||
| 599 | /* Return the width of ASCII character C. The width is measured by | 591 | /* Return the width of ASCII character C. The width is measured by |