From: Dmitry Antipov Date: Fri, 2 Aug 2013 03:55:24 +0000 (+0400) Subject: * xterm.h (struct x_output) [HAVE_X_I18N]: Remove xic_base_fontname X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1688^2~34 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=65b02bb9dc87ec52b3b3bc2fefa92827fb323003;p=emacs.git * 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. --- diff --git a/src/ChangeLog b/src/ChangeLog index 08b4e053e7b..b2b006d3e81 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2013-08-02 Dmitry Antipov + + * 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. + 2013-08-01 Paul Eggert * fileio.c, fns.c (merge): Move extern decl from here ... diff --git a/src/xfns.c b/src/xfns.c index e86f71fb711..642bdabb411 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; } diff --git a/src/xmenu.c b/src/xmenu.c index 1292e264ffb..66365a73fd0 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -159,8 +159,7 @@ mouse_position_for_popup (FRAME_PTR f, int *x, int *y) Window root, dummy_window; int dummy; - if (! FRAME_X_P (f)) - emacs_abort (); + eassert (FRAME_X_P (f)); block_input (); @@ -623,8 +622,7 @@ popup_widget_loop (int do_timers, GtkWidget *widget) void x_activate_menubar (FRAME_PTR f) { - if (! FRAME_X_P (f)) - emacs_abort (); + eassert (FRAME_X_P (f)); if (!f->output_data.x->saved_menu_event->type) return; @@ -839,8 +837,7 @@ update_frame_menubar (FRAME_PTR f) struct x_output *x; int columns, rows; - if (! FRAME_X_P (f)) - emacs_abort (); + eassert (FRAME_X_P (f)); x = f->output_data.x; @@ -927,8 +924,7 @@ set_frame_menubar (FRAME_PTR f, bool first_time, bool deep_p) bool *submenu_top_level_items; int *submenu_n_panes; - if (! FRAME_X_P (f)) - emacs_abort (); + eassert (FRAME_X_P (f)); menubar_widget = f->output_data.x->menubar_widget; @@ -1286,8 +1282,7 @@ free_frame_menubar (FRAME_PTR f) { Widget menubar_widget; - if (! FRAME_X_P (f)) - emacs_abort (); + eassert (FRAME_X_P (f)); menubar_widget = f->output_data.x->menubar_widget; @@ -1434,8 +1429,7 @@ create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv, int x, int y, use_pos_func = 1; #endif - if (! FRAME_X_P (f)) - emacs_abort (); + eassert (FRAME_X_P (f)); xg_crazy_callback_abort = 1; menu = xg_create_widget ("popup", first_wv->name, f, first_wv, @@ -1539,8 +1533,7 @@ create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv, LWLIB_ID menu_id; Widget menu; - if (! FRAME_X_P (f)) - emacs_abort (); + eassert (FRAME_X_P (f)); #ifdef USE_LUCID apply_systemfont_to_menu (f, f->output_data.x->widget); @@ -1623,8 +1616,7 @@ xmenu_show (FRAME_PTR f, int x, int y, bool for_click, bool keymaps, ptrdiff_t specpdl_count = SPECPDL_INDEX (); - if (! FRAME_X_P (f)) - emacs_abort (); + eassert (FRAME_X_P (f)); *error_name = NULL; @@ -1906,8 +1898,7 @@ create_and_show_dialog (FRAME_PTR f, widget_value *first_wv) { GtkWidget *menu; - if (! FRAME_X_P (f)) - emacs_abort (); + eassert (FRAME_X_P (f)); menu = xg_create_widget ("dialog", first_wv->name, f, first_wv, G_CALLBACK (dialog_selection_callback), @@ -1953,8 +1944,7 @@ create_and_show_dialog (FRAME_PTR f, widget_value *first_wv) { LWLIB_ID dialog_id; - if (!FRAME_X_P (f)) - emacs_abort (); + eassert (FRAME_X_P (f)); dialog_id = widget_id_tick++; #ifdef USE_LUCID @@ -2012,8 +2002,7 @@ xdialog_show (FRAME_PTR f, ptrdiff_t specpdl_count = SPECPDL_INDEX (); - if (! FRAME_X_P (f)) - emacs_abort (); + eassert (FRAME_X_P (f)); *error_name = NULL; @@ -2269,8 +2258,7 @@ xmenu_show (FRAME_PTR f, int x, int y, bool for_click, bool keymaps, unsigned int dummy_uint; ptrdiff_t specpdl_count = SPECPDL_INDEX (); - if (! FRAME_X_P (f) && ! FRAME_MSDOS_P (f)) - emacs_abort (); + eassert (FRAME_X_P (f) || FRAME_MSDOS_P (f)); *error_name = 0; if (menu_items_n_panes == 0) diff --git a/src/xterm.h b/src/xterm.h index bf1d40a2787..5324ef628e7 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -590,7 +590,6 @@ struct x_output XIC xic; XIMStyle xic_style; XFontSet xic_xfs; - char *xic_base_fontname; #endif /* Relief GCs, colors etc. */ @@ -754,7 +753,6 @@ enum #define FRAME_X_XIM_STYLES(f) (FRAME_X_DISPLAY_INFO (f)->xim_styles) #define FRAME_XIC_STYLE(f) ((f)->output_data.x->xic_style) #define FRAME_XIC_FONTSET(f) ((f)->output_data.x->xic_xfs) -#define FRAME_XIC_BASE_FONTNAME(f) ((f)->output_data.x->xic_base_fontname) /* Value is the smallest width of any character in any font on frame F. */