/[emacs]/emacs/src/w32fns.c
ViewVC logotype

Diff of /emacs/src/w32fns.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.238 by jasonr, Mon Jul 19 07:56:20 2004 UTC revision 1.239 by jasonr, Tue Aug 31 22:43:26 2004 UTC
# Line 4642  int size; Line 4642  int size;
4642  {  {
4643    Lisp_Object bdf_fonts;    Lisp_Object bdf_fonts;
4644    struct font_info *retval = NULL;    struct font_info *retval = NULL;
4645      struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f);
4646    
4647    bdf_fonts = w32_list_bdf_fonts (build_string (fontname), 1);    bdf_fonts = w32_list_bdf_fonts (build_string (fontname), 1);
4648    
# Line 4649  int size; Line 4650  int size;
4650      {      {
4651        char *bdf_name, *bdf_file;        char *bdf_name, *bdf_file;
4652        Lisp_Object bdf_pair;        Lisp_Object bdf_pair;
4653          int i;
4654    
4655        bdf_name = SDATA (XCAR (bdf_fonts));        bdf_name = SDATA (XCAR (bdf_fonts));
4656        bdf_pair = Fassoc (XCAR (bdf_fonts), Vw32_bdf_filename_alist);        bdf_pair = Fassoc (XCAR (bdf_fonts), Vw32_bdf_filename_alist);
4657        bdf_file = SDATA (XCDR (bdf_pair));        bdf_file = SDATA (XCDR (bdf_pair));
4658    
4659          // If the font is already loaded, do not load it again.
4660          for (i = 0; i < dpyinfo->n_fonts; i++)
4661            {
4662              if ((dpyinfo->font_table[i].name
4663                   && !strcmp (dpyinfo->font_table[i].name, bdf_name))
4664                  || (dpyinfo->font_table[i].full_name
4665                      && !strcmp (dpyinfo->font_table[i].full_name, bdf_name)))
4666                return dpyinfo->font_table[i];
4667            }
4668    
4669        retval = w32_load_bdf_font (f, bdf_name, size, bdf_file);        retval = w32_load_bdf_font (f, bdf_name, size, bdf_file);
4670    
4671        bdf_fonts = XCDR (bdf_fonts);        bdf_fonts = XCDR (bdf_fonts);

Legend:
Removed from v.1.238  
changed lines
  Added in v.1.239

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26