mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 08:43:40 -07:00
Code Issues Projects Releases Wiki Activity

(realize_default_face): If the font chosen for the

Browse source 
default face was different from the frame font, adjust the frame
font.
This commit is contained in:
Kenichi Handa 2006-05-10 12:38:58 +00:00
parent dec940492f
commit 4da9c1365a
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2006-05-10 Kenichi Handa <handa@m17n.org>
* xfaces.c (realize_default_face) [HAVE_X_WINDOWS]: If the font
chosen for the default face was different from the frame font,
adjust the frame font.
2006-05-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* image.c (Qduration) [MAC_OS]: Undo previous change.

10
src/xfaces.c
View file

@ -7072,6 +7072,16 @@ realize_default_face (f)
check_lface (lface);
bcopy (XVECTOR (lface)->contents, attrs, sizeof attrs);
face = realize_face (c, attrs, 0, NULL, DEFAULT_FACE_ID);
#ifdef HAVE_WINDOW_SYSTEM
#ifdef HAVE_X_WINDOWS
if (face->font != FRAME_FONT (f))
/* As the font specified for the frame was not acceptable as a
font for the default face (perhaps because auto-scaled fonts
are rejected), we must adjust the frame font. */
x_set_font (f, build_string (face->font_name), Qnil);
#endif /* HAVE_X_WINDOWS */
#endif /* HAVE_WINDOW_SYSTEM */
return 1;
}