Mercurial > emacs

diff src/xterm.c @ 57633:ead4249849ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* xterm.h (x_output): New member `xic_base_fontname'. (FRAME_XIC_BASE_FONTNAME): New macro. (xic_free_xfontset): Declare. * xfns.c (xic_create_xfontset): Share fontsets between frames based on base_fontname. (xic_free_xfontset): New function. (free_frame_xic): Use it. (xic_set_xfontset): Ditto. * xterm.c (xim_destroy_callback): Ditto.
author Jan Dj?rv <jan.h.d@swipnet.se>
date Thu, 21 Oct 2004 18:38:58 +0000
parents 5a8bd30665f2
children cdbca26f9090 ae7fab96922c f3ec05478165
line wrap: on
line diff
--- a/src/xterm.c	Thu Oct 21 15:41:15 2004 +0000
+++ b/src/xterm.c	Thu Oct 21 18:38:58 2004 +0000
@@ -8012,11 +8012,7 @@
       if (FRAME_X_DISPLAY_INFO (f) == dpyinfo)
 	{
 	  FRAME_XIC (f) = NULL;
-	  if (FRAME_XIC_FONTSET (f))
-	    {
-	      XFreeFontSet (FRAME_X_DISPLAY (f), FRAME_XIC_FONTSET (f));
-	      FRAME_XIC_FONTSET (f) = NULL;
-	    }
+          xic_free_xfontset (f);
 	}
     }