[Emacs-diffs] Changes to emacs/src/xterm.h

[Jan Djärv]

Index: emacs/src/xterm.h
diff -c emacs/src/xterm.h:1.166 emacs/src/xterm.h:1.167
*** emacs/src/xterm.h:1.166     Wed Oct 20 16:53:27 2004
--- emacs/src/xterm.h   Thu Oct 21 18:38:58 2004
***************
*** 600,605 ****
--- 600,606 ----
    XIC xic;
    XIMStyle xic_style;
    XFontSet xic_xfs;
+   char *xic_base_fontname;
  #endif
  
    /* Relief GCs, colors etc.  */
***************
*** 734,739 ****
--- 735,741 ----
  #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.  */
  
***************
*** 1043,1048 ****
--- 1045,1051 ----
  extern unsigned char * x_encode_text P_ ((Lisp_Object, Lisp_Object, int,
                                          int *, int *));
  extern void x_implicitly_set_name P_ ((struct frame *, Lisp_Object, 
Lisp_Object));
+ extern void xic_free_xfontset P_ ((struct frame *));
  extern void create_frame_xic P_ ((struct frame *));
  extern void destroy_frame_xic P_ ((struct frame *));
  extern void xic_set_preeditarea P_ ((struct window *, int, int));