diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-13 16:22:35 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-13 16:22:35 -0700 |
| commit | 239f9db96059f3f76e4b4a6f31f6eb56f642ea84 (patch) | |
| tree | d37c48bf372a31f9433c35c6128e9401f5335b53 /src/dispextern.h | |
| parent | dfcf35798287d2483c1136d156e0f692ccea3b18 (diff) | |
| download | emacs-239f9db96059f3f76e4b4a6f31f6eb56f642ea84.tar.gz | |
* font.c, fontset.c: Make symbols static if they're not exported.
* dispextern.h (FACE_SUITABLE_FOR_ASCII_CHAR_P): New macro.
(FACE_SUITABLE_FOR_CHAR_P): Use it.
* font.c (font_close_object): Now static.
* font.h (font_close_object): Remove.
* fontset.c (FONTSET_OBJLIST): Remove.
(free_realized_fontset) #if-0 the body, which does nothing.
(face_suitable_for_char_p): #if-0, as it's never called.
* fontset.h (face_suitable_for_char_p): Remove decl.
* xfaces.c (face_at_string_position): Use
FACE_SUITABLE_FOR_ASCII_CHAR_P, not FACE_SUITABLE_FOR_CHAR_P,
since 0 is always ASCII.
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 4ad107a7266..d57aaee3e7d 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1733,9 +1733,12 @@ struct face_cache /* Non-zero if FACE is suitable for displaying character CHAR. */ +#define FACE_SUITABLE_FOR_ASCII_CHAR_P(FACE, CHAR) \ + ((FACE) == (FACE)->ascii_face) + #define FACE_SUITABLE_FOR_CHAR_P(FACE, CHAR) \ (ASCII_CHAR_P (CHAR) \ - ? (FACE) == (FACE)->ascii_face \ + ? FACE_SUITABLE_FOR_ASCII_CHAR_P(FACE) \ : face_suitable_for_char_p ((FACE), (CHAR))) /* Return the id of the realized face on frame F that is like the face |