martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(Fnew_fontset): Call font_unparse_xlfd with 256-byte

Browse Source 
buffer.  Check the return value of it.
This commit is contained in:
Kenichi Handa
2008-05-15 00:42:32 +00:00
parent 4079589f63
commit 5f2d79e053
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@@ -1,3 +1,8 @@
2008-05-15 Kenichi Handa <handa@m17n.org>
* fontset.c (Fnew_fontset): Call font_unparse_xlfd with 256-byte
buffer. Check the return value of it.
2008-05-14 Jason Rumney <jasonr@gnu.org>
* w32term.c (w32_get_glyph_overhangs): Remove.

7
src/fontset.c
View File

@@ -1557,7 +1557,7 @@ FONT-SPEC is a vector, a cons, or a string. See the documentation of
{
Lisp_Object font_spec = Ffont_spec (0, NULL);
Lisp_Object short_name;
char *xlfd;
char xlfd[256];
int len;
if (font_parse_xlfd (SDATA (name), font_spec) < 0)
@@ -1570,8 +1570,9 @@ FONT-SPEC is a vector, a cons, or a string. See the documentation of
Vfontset_alias_alist);
ASET (font_spec, FONT_REGISTRY_INDEX, Qiso8859_1);
fontset = make_fontset (Qnil, name, Qnil);
xlfd = alloca (SBYTES (name) + 1);
len = font_unparse_xlfd (font_spec, 0, xlfd, SBYTES (name) + 1);
len = font_unparse_xlfd (font_spec, 0, xlfd, 256);
if (len < 0)
error ("Invalid fontset name (perhaps too long): %s", SDATA (name));
FONTSET_ASCII (fontset) = make_unibyte_string (xlfd, len);
}
else