mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-07 12:20:39 -08:00
Code Issues Projects Releases Wiki Activity

(x_new_font): Optimize for the case that the font is

Browse source 
already set for the frame.
This commit is contained in:
Kenichi Handa 2003-01-07 01:26:33 +00:00
parent 07ad7d434e
commit 2570e34465
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/xterm.c
View file

@ -12258,6 +12258,11 @@ x_new_font (f, fontname)
if (!fontp)
return Qnil;
if (f->output_data.x->font == (XFontStruct *) (fontp->font))
/* This font is already set in frame F. There's nothing more to
do. */
return build_string (fontp->full_name);
f->output_data.x->font = (XFontStruct *) (fontp->font);
f->output_data.x->baseline_offset = fontp->baseline_offset;
f->output_data.x->fontset = -1;
@ -12302,13 +12307,16 @@ x_new_font (f, fontname)
return build_string (fontp->full_name);
}
/* Give frame F the fontset named FONTSETNAME as its default font, and
return the full name of that fontset. FONTSETNAME may be a wildcard
pattern; in that case, we choose some fontset that fits the pattern.
/* Give frame F the fontset named FONTSETNAME as its default fontset,
and return the full name of that fontset. FONTSETNAME may be a
wildcard pattern; in that case, we choose some fontset that fits
the pattern. FONTSETNAME may be a font name for ASCII characters;
in that case, we create a fontset from that font name.
The return value shows which fontset we chose.
If FONTSETNAME specifies the default fontset, return Qt.
If an ASCII font specified in the specified fontset can't be
loaded, return Qnil. */
If an ASCII font in the specified fontset can't be loaded, return
Qnil. */
Lisp_Object
x_new_fontset (f, fontsetname)