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

[Miles Bader]

Index: emacs/src/xterm.h
diff -c emacs/src/xterm.h:1.150.2.4 emacs/src/xterm.h:1.150.2.5
*** emacs/src/xterm.h:1.150.2.4 Thu Oct 14 08:49:55 2004
--- emacs/src/xterm.h   Fri Oct 22 10:13:35 2004
***************
*** 21,28 ****
--- 21,33 ----
  
  #include <X11/Xlib.h>
  #include <X11/cursorfont.h>
+ 
+ /* Include Xutil.h after keysym.h to work around a bug that prevents
+    correct recognition of AltGr key in some X versions.  */
+ 
  #include <X11/keysym.h>
  #include <X11/Xutil.h>
+ 
  #include <X11/Xatom.h>
  #include <X11/Xresource.h>
  
***************
*** 45,51 ****
  typedef GtkWidget *xt_or_gtk_widget;
  #define XtParent(x) (gtk_widget_get_parent (x))
  #undef XSync
! #define XSync(d, b) gdk_window_process_all_updates ()
  
  #endif /* USE_GTK */
  
--- 50,58 ----
  typedef GtkWidget *xt_or_gtk_widget;
  #define XtParent(x) (gtk_widget_get_parent (x))
  #undef XSync
! #define XSync(d, b) do { gdk_window_process_all_updates (); \
!                          XSync (d, b);  } while (0)
!      
  
  #endif /* USE_GTK */
  
***************
*** 596,601 ****
--- 603,609 ----
    XIC xic;
    XIMStyle xic_style;
    XFontSet xic_xfs;
+   char *xic_base_fontname;
  #endif
  
    /* Relief GCs, colors etc.  */
***************
*** 730,735 ****
--- 738,744 ----
  #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.  */
  
***************
*** 1039,1044 ****
--- 1048,1054 ----
  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));