diff options
| author | Dima Kogan <dima@secretsauce.net> | 2015-02-09 15:52:48 +0100 |
|---|---|---|
| committer | Jan D <jhd@f20.localdomain> | 2015-02-09 15:52:48 +0100 |
| commit | 054dcbab2414e72d7c743214b7c56408fa4912dd (patch) | |
| tree | 1f8d6fe8ad842b88ec618fd94a49c88ac3402046 /src/xfaces.c | |
| parent | 83e5a17c3492f6d0bc79457624e69a1655ccb238 (diff) | |
| download | emacs-054dcbab2414e72d7c743214b7c56408fa4912dd.tar.gz | |
Try non-scaled xld fonts first, and scaled if that failed.
Fixes: debbugs:19117
* xfaces.c (realize_basic_faces): Don't set Qscalable_fonts_allowed to
t.
* font.c (font_score): Try to find a font without scaling first,
and only accept scalable fonts if we did not get a match.
Diffstat (limited to 'src/xfaces.c')
| -rw-r--r-- | src/xfaces.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 6e01ab08cef..d0fe8726cbb 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -5141,12 +5141,10 @@ static bool realize_basic_faces (struct frame *f) { bool success_p = false; - ptrdiff_t count = SPECPDL_INDEX (); /* Block input here so that we won't be surprised by an X expose event, for instance, without having the faces set up. */ block_input (); - specbind (Qscalable_fonts_allowed, Qt); if (realize_default_face (f)) { @@ -5180,7 +5178,6 @@ realize_basic_faces (struct frame *f) success_p = true; } - unbind_to (count, Qnil); unblock_input (); return success_p; } |