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/fontset.c | |
| 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/fontset.c')
| -rw-r--r-- | src/fontset.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/fontset.c b/src/fontset.c index c8452979eee..5aa65c85110 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -238,7 +238,7 @@ fontset_id_valid_p (int id) /* Macros to access special values of (realized) FONTSET. */ #define FONTSET_BASE(fontset) XCHAR_TABLE (fontset)->extras[2] #define FONTSET_FRAME(fontset) XCHAR_TABLE (fontset)->extras[3] -#define FONTSET_OBJLIST(fontset) XCHAR_TABLE (fontset)->extras[4] +/* #define FONTSET_OBJLIST(fontset) XCHAR_TABLE (fontset)->extras[4] */ #define FONTSET_NOFONT_FACE(fontset) XCHAR_TABLE (fontset)->extras[5] /* #define FONTSET_REPERTORY(fontset) XCHAR_TABLE (fontset)->extras[6] */ #define FONTSET_DEFAULT(fontset) XCHAR_TABLE (fontset)->extras[7] @@ -838,6 +838,7 @@ fontset_ascii (int id) static void free_realized_fontset (FRAME_PTR f, Lisp_Object fontset) { +#if 0 Lisp_Object tail; if (0) @@ -846,6 +847,7 @@ free_realized_fontset (FRAME_PTR f, Lisp_Object fontset) xassert (FONT_OBJECT_P (XCAR (tail))); font_close_object (f, XCAR (tail)); } +#endif } /* Free fontset of FACE defined on frame F. Called from @@ -881,6 +883,7 @@ free_face_fontset (FRAME_PTR f, struct face *face) } +#if 0 /* Return 1 if FACE is suitable for displaying character C. Otherwise return 0. Called from the macro FACE_SUITABLE_FOR_CHAR_P when C is not an ASCII character. */ @@ -896,6 +899,7 @@ face_suitable_for_char_p (struct face *face, int c) && INTEGERP (RFONT_DEF_FACE (rfont_def)) && face->id == XINT (RFONT_DEF_FACE (rfont_def))); } +#endif /* Return ID of face suitable for displaying character C on frame F. |