diff options
| author | Paul Eggert | 2012-09-26 13:00:29 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-09-26 13:00:29 -0700 |
| commit | 41c8bfcfbe028fc559a7eabc0dfe0c6fcafcb7cf (patch) | |
| tree | d491da2fa61a23c76088fb8447c66bc7fd197856 /src/character.h | |
| parent | 3a880af4a79688e90da45311a8d85bae2d59a811 (diff) | |
| download | emacs-41c8bfcfbe028fc559a7eabc0dfe0c6fcafcb7cf.tar.gz emacs-41c8bfcfbe028fc559a7eabc0dfe0c6fcafcb7cf.zip | |
* character.h (MAYBE_UNIFY_CHAR): Remove.
* charset.c, charset.h (maybe_unify_char): Now static.
* charset.c (decode_char): Use maybe_unify_char, not MAYBE_UNIFY_CHAR.
Since this stuff is now private to charset.c, there's no need for
a public macro and no need to inline by hand.
Diffstat (limited to 'src/character.h')
| -rw-r--r-- | src/character.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/character.h b/src/character.h index 70d4e67a978..b2cdcb76699 100644 --- a/src/character.h +++ b/src/character.h | |||
| @@ -554,23 +554,6 @@ INLINE_HEADER_BEGIN | |||
| 554 | } while (0) | 554 | } while (0) |
| 555 | 555 | ||
| 556 | 556 | ||
| 557 | /* If C is a character to be unified with a Unicode character, return | ||
| 558 | the unified Unicode character. */ | ||
| 559 | |||
| 560 | #define MAYBE_UNIFY_CHAR(c) \ | ||
| 561 | do { \ | ||
| 562 | if (c > MAX_UNICODE_CHAR && c <= MAX_5_BYTE_CHAR) \ | ||
| 563 | { \ | ||
| 564 | Lisp_Object val; \ | ||
| 565 | val = CHAR_TABLE_REF (Vchar_unify_table, c); \ | ||
| 566 | if (INTEGERP (val)) \ | ||
| 567 | c = XFASTINT (val); \ | ||
| 568 | else if (! NILP (val)) \ | ||
| 569 | c = maybe_unify_char (c, val); \ | ||
| 570 | } \ | ||
| 571 | } while (0) | ||
| 572 | |||
| 573 | |||
| 574 | /* Return a non-outlandish value for the tab width. */ | 557 | /* Return a non-outlandish value for the tab width. */ |
| 575 | 558 | ||
| 576 | #define SANE_TAB_WIDTH(buf) \ | 559 | #define SANE_TAB_WIDTH(buf) \ |