diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2006-05-17 18:05:02 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2006-05-17 18:05:02 +0000 |
| commit | 9f97e26d01003a17b861505d535c89ad73799b7e (patch) | |
| tree | 5855a1dedaf55418a1e2b867d5813853287cf474 /src/xfaces.c | |
| parent | 8dadeb1e1f78c7be07db5ae78aa9eed58d272a4e (diff) | |
| parent | 8d1bec8de1c570475c1332d1305bea21ffda44f1 (diff) | |
| download | emacs-9f97e26d01003a17b861505d535c89ad73799b7e.tar.gz | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-273
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-274
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-275
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-276
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-277
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-278
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-279
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-280
Update etc/MORE.STUFF.
* emacs@sv.gnu.org/emacs--devo--0--patch-281
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-282
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-283
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-284
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-101
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-557
Diffstat (limited to 'src/xfaces.c')
| -rw-r--r-- | src/xfaces.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 3222a7bdd91..fc2c8a768bf 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -7090,6 +7090,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; } |