Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
f9c34147
Commit
f9c34147
authored
Jan 01, 2009
by
Jason Rumney
Browse files
(x_new_font): Return font object, not fontset. (Bug#119)
Don't block input, as per earlier xterm.c changes.
parent
174dc00c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
12 deletions
+9
-12
src/ChangeLog
src/ChangeLog
+6
-1
src/w32term.c
src/w32term.c
+3
-11
No files found.
src/ChangeLog
View file @
f9c34147
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>
...
...
src/w32term.c
View file @
f9c34147
...
...
@@ -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 font
set_name (fontset)
;
return
font
_object
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment