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

Diff of /emacs/src/xfaces.c

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

revision 1.250.2.6 by handa, Fri Aug 23 02:26:44 2002 UTC revision 1.250.2.7 by handa, Fri Sep 27 04:50:58 2002 UTC
# Line 3220  set_lface_from_font_name (f, lface, font Line 3220  set_lface_from_font_name (f, lface, font
3220    
3221    /* If FONTNAME is actually a fontset name, get ASCII font name of it.  */    /* If FONTNAME is actually a fontset name, get ASCII font name of it.  */
3222    fontset = fs_query_fontset (fontname, 0);    fontset = fs_query_fontset (fontname, 0);
3223    if (fontset >= 0)    if (fontset > 0)
3224      font_name = XSTRING (fontset_ascii (fontset))->data;      font_name = XSTRING (fontset_ascii (fontset))->data;
3225      else if (fontset == 0)
3226        {
3227          if (may_fail_p)
3228            return 0;
3229          abort ();
3230        }
3231    
3232    /* Check if FONT_NAME is surely available on the system.  Usually    /* Check if FONT_NAME is surely available on the system.  Usually
3233       FONT_NAME is already cached for the frame F and FS_LOAD_FONT       FONT_NAME is already cached for the frame F and FS_LOAD_FONT
# Line 4156  FRAME 0 means change the face on all fra Line 4162  FRAME 0 means change the face on all fra
4162            if (!NILP (tmp))            if (!NILP (tmp))
4163              value = tmp;              value = tmp;
4164            else if (EQ (attr, QCfontset))            else if (EQ (attr, QCfontset))
4165              error ("Invalid fontset", XSTRING (value)->data);              signal_error ("Invalid fontset name", value);
4166    
4167            if (EQ (attr, QCfont))            if (EQ (attr, QCfont))
4168              {              {

Legend:
Removed from v.1.250.2.6  
changed lines
  Added in v.1.250.2.7

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