diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-08-02 07:55:24 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-08-02 07:55:24 +0400 |
| commit | 65b02bb9dc87ec52b3b3bc2fefa92827fb323003 (patch) | |
| tree | 089ac49aa4dbe63e925552a82156124f52c1577c /src/xfns.c | |
| parent | 99a0084e0549f0049b3597039bc86348587309b6 (diff) | |
* xterm.h (struct x_output) [HAVE_X_I18N]: Remove xic_base_fontname
member which is not really used any more.
(FRAME_XIC_BASE_FONTNAME): Remove.
* xfns.c (xic_free_fontset): Adjust user.
* xmenu.c (mouse_position_for_popup, x_activate_menubar)
(update_frame_menubar, set_frame_menubar, free_frame_menubar)
(create_and_show_popup_menu, xmenu_show, create_and_show_dialog)
(xdialog_show): Use eassert for debugging check.
Diffstat (limited to 'src/xfns.c')
| -rw-r--r-- | src/xfns.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/xfns.c b/src/xfns.c index e86f71fb71..642bdabb41 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -2088,9 +2088,6 @@ xic_free_xfontset (struct frame *f) /* The fontset is not used anymore. It is safe to free it. */ XFreeFontSet (FRAME_X_DISPLAY (f), FRAME_XIC_FONTSET (f)); - if (FRAME_XIC_BASE_FONTNAME (f)) - xfree (FRAME_XIC_BASE_FONTNAME (f)); - FRAME_XIC_BASE_FONTNAME (f) = NULL; FRAME_XIC_FONTSET (f) = NULL; } |