[Emacs-diffs] emacs/src w32term.c

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   09/01/01 02:05:40

Modified files:
        src            : w32term.c 

Log message:
        (x_new_font): Return font object, not fontset. (Bug#119)
        Don't block input, as per earlier xterm.c changes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32term.c?cvsroot=emacs&r1=1.313&r2=1.314

Patches:
Index: w32term.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32term.c,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -b -r1.313 -r1.314
--- w32term.c   23 Dec 2008 07:28:08 -0000      1.313
+++ w32term.c   1 Jan 2009 02:05:39 -0000       1.314
@@ -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;
+  /* X version sets font of input methods here also.  */
 
-  return fontset_name (fontset);
+  return font_object;
 }