Commit 63e50ea6 authored by Jason Rumney's avatar Jason Rumney

2004-08-31 NAKAMURA Toshikazu <nr-tkz@nifty.com> (tiny change)

	* w32fns.c (w32_load_font): If a BDF font is already loaded, do not
	reload it.
parent f7e22385
......@@ -4642,6 +4642,7 @@ int size;
{
Lisp_Object bdf_fonts;
struct font_info *retval = NULL;
struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f);
bdf_fonts = w32_list_bdf_fonts (build_string (fontname), 1);
......@@ -4649,11 +4650,22 @@ int size;
{
char *bdf_name, *bdf_file;
Lisp_Object bdf_pair;
int i;
bdf_name = SDATA (XCAR (bdf_fonts));
bdf_pair = Fassoc (XCAR (bdf_fonts), Vw32_bdf_filename_alist);
bdf_file = SDATA (XCDR (bdf_pair));
// If the font is already loaded, do not load it again.
for (i = 0; i < dpyinfo->n_fonts; i++)
{
if ((dpyinfo->font_table[i].name
&& !strcmp (dpyinfo->font_table[i].name, bdf_name))
|| (dpyinfo->font_table[i].full_name
&& !strcmp (dpyinfo->font_table[i].full_name, bdf_name)))
return dpyinfo->font_table[i];
}
retval = w32_load_bdf_font (f, bdf_name, size, bdf_file);
bdf_fonts = XCDR (bdf_fonts);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment