diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2004-10-21 18:38:58 +0000 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2004-10-21 18:38:58 +0000 |
| commit | c27ed90af576892cae147bfe6be1a8b43126102a (patch) | |
| tree | f4160cfb96b7cb46e98ae9a865c086b6c782a411 /src/xterm.c | |
| parent | 6e237e7298748ebb5fe7baa4d56a5cf7cbac224b (diff) | |
| download | emacs-c27ed90af576892cae147bfe6be1a8b43126102a.tar.gz | |
* xterm.h (x_output): New member `xic_base_fontname'.
(FRAME_XIC_BASE_FONTNAME): New macro.
(xic_free_xfontset): Declare.
* xfns.c (xic_create_xfontset): Share fontsets between frames
based on base_fontname.
(xic_free_xfontset): New function.
(free_frame_xic): Use it.
(xic_set_xfontset): Ditto.
* xterm.c (xim_destroy_callback): Ditto.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/xterm.c b/src/xterm.c index 41b7c18e820..54ee4014e8c 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -8012,11 +8012,7 @@ xim_destroy_callback (xim, client_data, call_data) if (FRAME_X_DISPLAY_INFO (f) == dpyinfo) { FRAME_XIC (f) = NULL; - if (FRAME_XIC_FONTSET (f)) - { - XFreeFontSet (FRAME_X_DISPLAY (f), FRAME_XIC_FONTSET (f)); - FRAME_XIC_FONTSET (f) = NULL; - } + xic_free_xfontset (f); } } |