Mercurial > hg > xemacs-beta
changeset 4801:591091481f20
Merge changeset #b828e06dbe38 with tip
| author | Didier Verna <didier@xemacs.org> |
|---|---|
| date | Wed, 06 Jan 2010 13:56:38 +0100 |
| parents | b828e06dbe38 (current diff) ca99a807b025 (diff) |
| children | 2fc0e2f18322 |
| files | |
| diffstat | 2 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Jan 06 13:48:25 2010 +0100 +++ b/src/ChangeLog Wed Jan 06 13:56:38 2010 +0100 @@ -1,3 +1,8 @@ +2010-01-05 Jerry James <james@xemacs.org> + + * font-mgr.c (Ffc_name_unparse): Return value of FcNameUnparse + must be freed. + 2009-12-31 Aidan Kehoe <kehoea@parhasard.net> * eval.c (Ffunctionp):
--- a/src/font-mgr.c Wed Jan 06 13:48:25 2010 +0100 +++ b/src/font-mgr.c Wed Jan 06 13:56:38 2010 +0100 @@ -260,8 +260,13 @@ */ (pattern)) { + FcChar8 *name; + Lisp_Object result; CHECK_FCPATTERN(pattern); - return build_fcapi_string (FcNameUnparse (XFCPATTERN_PTR (pattern))); + name = FcNameUnparse (XFCPATTERN_PTR (pattern)); + result = build_fcapi_string (name); + xfree (name, FcChar8 *); + return result; } DEFUN("fc-pattern-duplicate", Ffc_pattern_duplicate, 1, 1, 0, /*