[Emacs-diffs] trunk r113646: * xterm.h (struct x_output) [HAVE_X_I18N]: Remove xic_base_fontname

[Dmitry Antipov]

------------------------------------------------------------
revno: 113646
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Fri 2013-08-02 07:55:24 +0400
message:
  * 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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xfns.c                     xfns.c-20091113204419-o5vbwnq5f7feedwu-274
  src/xmenu.c                    xmenu.c-20091113204419-o5vbwnq5f7feedwu-161
  src/xterm.h                    xterm.h-20091113204419-o5vbwnq5f7feedwu-228

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-01 22:53:03 +0000
+++ b/src/ChangeLog     2013-08-02 03:55:24 +0000
@@ -1,3 +1,14 @@
+2013-08-02  Dmitry Antipov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * fileio.c, fns.c (merge): Move extern decl from here ...

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2013-07-31 12:50:59 +0000
+++ b/src/xfns.c        2013-08-02 03:55:24 +0000
@@ -2088,9 +2088,6 @@
     /* 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;
 }
 

=== modified file 'src/xmenu.c'
--- a/src/xmenu.c       2013-07-31 12:50:59 +0000
+++ b/src/xmenu.c       2013-08-02 03:55:24 +0000
@@ -159,8 +159,7 @@
   Window root, dummy_window;
   int dummy;
 
-  if (! FRAME_X_P (f))
-    emacs_abort ();
+  eassert (FRAME_X_P (f));
 
   block_input ();
 
@@ -623,8 +622,7 @@
 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 @@
   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 @@
   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 @@
 {
   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 @@
   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 @@
   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 @@
 
   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 @@
 {
   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 @@
 {
   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 @@
 
   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 @@
   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)

=== modified file 'src/xterm.h'
--- a/src/xterm.h       2013-08-01 07:33:58 +0000
+++ b/src/xterm.h       2013-08-02 03:55:24 +0000
@@ -590,7 +590,6 @@
   XIC xic;
   XIMStyle xic_style;
   XFontSet xic_xfs;
-  char *xic_base_fontname;
 #endif
 
   /* Relief GCs, colors etc.  */
@@ -754,7 +753,6 @@
 #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.  */