Mercurial > emacs
changeset 100805:20169cf90421
(x_new_font): Return font object, not fontset. (Bug#119)
Don't block input, as per earlier xterm.c changes.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Thu, 01 Jan 2009 02:05:39 +0000 |
| parents | 007ec92e4924 |
| children | 272039b93c20 |
| files | src/w32term.c |
| diffstat | 1 files changed, 4 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- 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; }