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

Diff of /emacs/src/xterm.c

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

revision 1.707.2.15 by fx, Thu Oct 31 17:55:03 2002 UTC revision 1.707.2.16 by handa, Tue Jan 7 01:26:33 2003 UTC
# Line 12258  x_new_font (f, fontname) Line 12258  x_new_font (f, fontname)
12258    if (!fontp)    if (!fontp)
12259      return Qnil;      return Qnil;
12260    
12261      if (f->output_data.x->font == (XFontStruct *) (fontp->font))
12262        /* This font is already set in frame F.  There's nothing more to
12263           do.  */
12264        return build_string (fontp->full_name);
12265    
12266    f->output_data.x->font = (XFontStruct *) (fontp->font);    f->output_data.x->font = (XFontStruct *) (fontp->font);
12267    f->output_data.x->baseline_offset = fontp->baseline_offset;    f->output_data.x->baseline_offset = fontp->baseline_offset;
12268    f->output_data.x->fontset = -1;    f->output_data.x->fontset = -1;
# Line 12302  x_new_font (f, fontname) Line 12307  x_new_font (f, fontname)
12307    return build_string (fontp->full_name);    return build_string (fontp->full_name);
12308  }  }
12309    
12310  /* Give frame F the fontset named FONTSETNAME as its default font, and  /* Give frame F the fontset named FONTSETNAME as its default fontset,
12311     return the full name of that fontset.  FONTSETNAME may be a wildcard     and return the full name of that fontset.  FONTSETNAME may be a
12312     pattern; in that case, we choose some fontset that fits the pattern.     wildcard pattern; in that case, we choose some fontset that fits
12313       the pattern.  FONTSETNAME may be a font name for ASCII characters;
12314       in that case, we create a fontset from that font name.
12315    
12316     The return value shows which fontset we chose.       The return value shows which fontset we chose.  
12317     If FONTSETNAME specifies the default fontset, return Qt.     If FONTSETNAME specifies the default fontset, return Qt.
12318     If an ASCII font specified in the specified fontset can't be     If an ASCII font in the specified fontset can't be loaded, return
12319     loaded, return Qnil.  */     Qnil.  */
12320    
12321  Lisp_Object  Lisp_Object
12322  x_new_fontset (f, fontsetname)  x_new_fontset (f, fontsetname)

Legend:
Removed from v.1.707.2.15  
changed lines
  Added in v.1.707.2.16

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