/[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.123.2.1 by andrewi, Thu Oct 18 12:38:54 2001 UTC revision 1.123.2.2 by jasonr, Tue Oct 30 22:32:54 2001 UTC
# Line 5946  static char * Line 5946  static char *
5946  w32_to_x_charset (fncharset)  w32_to_x_charset (fncharset)
5947      int fncharset;      int fncharset;
5948  {  {
5949    static char buf[16];    static char buf[32];
5950    Lisp_Object charset_type;    Lisp_Object charset_type;
5951    
5952    switch (fncharset)    switch (fncharset)
# Line 6093  w32_to_x_charset (fncharset) Line 6093  w32_to_x_charset (fncharset)
6093          return buf;          return buf;
6094        }        }
6095    
6096      strncpy(buf, best_match, 15);      strncpy(buf, best_match, 31);
6097      buf[15] = '\0';      buf[31] = '\0';
6098      return buf;      return buf;
6099    }    }
6100  }  }
# Line 6624  enum_font_cb2 (lplf, lptm, FontType, lpe Line 6624  enum_font_cb2 (lplf, lptm, FontType, lpe
6624      int FontType;      int FontType;
6625      enumfont_t * lpef;      enumfont_t * lpef;
6626  {  {
6627    if (lplf->elfLogFont.lfStrikeOut || lplf->elfLogFont.lfUnderline)    /* Ignore struck out, underlined and vertical versions of fonts.  */
6628      return (1);    if (lplf->elfLogFont.lfStrikeOut || lplf->elfLogFont.lfUnderline
6629          || lplf->elfLogFont.lfEscapement != 0
6630          || lplf->elfLogFont.lfOrientation != 0)
6631        return 1;
6632        
6633    /* Check that the character set matches if it was specified */    /* Check that the character set matches if it was specified */
6634    if (lpef->logfont.lfCharSet != DEFAULT_CHARSET &&    if (lpef->logfont.lfCharSet != DEFAULT_CHARSET &&
6635        lplf->elfLogFont.lfCharSet != lpef->logfont.lfCharSet)        lplf->elfLogFont.lfCharSet != lpef->logfont.lfCharSet)
6636      return (1);      return 1;
6637    
6638    {    {
6639      char buf[100];      char buf[100];
# Line 6677  enum_font_cb2 (lplf, lptm, FontType, lpe Line 6680  enum_font_cb2 (lplf, lptm, FontType, lpe
6680    
6681      /* TODO: List all relevant charsets if charset not specified. */      /* TODO: List all relevant charsets if charset not specified. */
6682      if (!w32_to_x_font (&(lplf->elfLogFont), buf, 100, charset))      if (!w32_to_x_font (&(lplf->elfLogFont), buf, 100, charset))
6683        return (0);        return 0;
6684    
6685      if (NILP (*(lpef->pattern))      if (NILP (*(lpef->pattern))
6686          || w32_font_match (buf, XSTRING (*(lpef->pattern))->data))          || w32_font_match (buf, XSTRING (*(lpef->pattern))->data))
# Line 6688  enum_font_cb2 (lplf, lptm, FontType, lpe Line 6691  enum_font_cb2 (lplf, lptm, FontType, lpe
6691        }        }
6692    }    }
6693    
6694    return (1);    return 1;
6695  }  }
6696    
6697  static int CALLBACK  static int CALLBACK

Legend:
Removed from v.1.123.2.1  
changed lines
  Added in v.1.123.2.2

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