# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1230775539 0
# Node ID 20169cf9042101e250b6a26180cc9559dd125e45
# Parent  007ec92e4924b7ce627454de63b3975f66b8dccd
(x_new_font): Return font object, not fontset. (Bug#119)
Don't block input, as per earlier xterm.c changes.

diff -r 007ec92e4924 -r 20169cf90421 src/w32term.c
--- a/src/w32term.c	Wed Dec 31 17:13:32 2008 +0000
+++ b/src/w32term.c	Thu Jan 01 02:05:39 2009 +0000
@@ -5229,9 +5229,7 @@
   if (FRAME_FONT (f) == font)
     /* This font is already set in frame F.  There's nothing more to
        do.  */
-    return fontset_name (fontset);
-
-  BLOCK_INPUT;
+    return font_object;
 
   FRAME_FONT (f) = font;
   FRAME_BASELINE_OFFSET (f) = font->baseline_offset;
@@ -5264,15 +5262,9 @@
 	x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f));
     }
 
-#ifdef HAVE_X_I18N
-  if (FRAME_XIC (f)
-      && (FRAME_XIC_STYLE (f) & (XIMPreeditPosition | XIMStatusArea)))
-    xic_set_xfontset (f, SDATA (fontset_ascii (fontset)));
-#endif
-
-  UNBLOCK_INPUT;
-
-  return fontset_name (fontset);
+  /* X version sets font of input methods here also.  */
+
+  return font_object;
 }