Commit f9c34147 authored by Jason Rumney's avatar Jason Rumney

(x_new_font): Return font object, not fontset. (Bug#119)

Don't block input, as per earlier xterm.c changes.
parent 174dc00c
2009-01-01 Jason Rumney <jasonr@gnu.org>
* w32term.c (x_new_font): Return font object, not fontset. (Bug#119)
Don't block input, as per earlier xterm.c changes.
2008-12-31 Adrian Robert <Adrian.B.Robert@gmail.com>
* nsfns.m (ns_appkit_version_str): Rename from ns_appkit_version.
......@@ -31,7 +36,7 @@
2008-12-30 Jason Rumney <jasonr@gnu.org>
* frame.c (store_frame_param, x_get_arg): Enable newer code on
WINDOWSNT too, as related changes have already been synced.
WINDOWSNT too, as related changes have already been synced. (Bug#117)
2008-12-30 Chong Yidong <cyd@stupidchicken.com>
......
......@@ -5229,9 +5229,7 @@ x_new_font (f, font_object, fontset)
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_new_font (f, font_object, fontset)
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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment