mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-27 15:52:00 -08:00
Code Issues Projects Releases Wiki Activity

(compute_metrics): Don't mess with glyph_idx setting here.

Browse source
This commit is contained in:
Jason Rumney 2008-08-02 21:26:08 +00:00
parent ac1831635b
commit 4ff1bf172e
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2008-08-02 Jason Rumney <jasonr@gnu.org>
* w32font.c (compute_metrics): Don't mess with glyph_idx setting here.
2008-08-02 Eli Zaretskii <eliz@gnu.org>
* alloc.c (NSTATICS): Bump to 0x640.

8
src/w32font.c
View file

@ -2265,14 +2265,6 @@ compute_metrics (dc, w32_font, code, metrics)
metrics->width = gm.gmCellIncX;
metrics->status = W32METRIC_SUCCESS;
}
else if (w32_font->glyph_idx)
{
/* Can't use glyph indexes after all.
Avoid it in future, and clear any metrics that were based on
glyph indexes. */
w32_font->glyph_idx = 0;
clear_cached_metrics (w32_font);
}
else
metrics->status = W32METRIC_FAIL;
}