Mercurial > hg > xemacs-beta
comparison src/font-mgr.c @ 4801:591091481f20
Merge changeset #b828e06dbe38 with tip
author | Didier Verna <didier@xemacs.org> |
---|---|
date | Wed, 06 Jan 2010 13:56:38 +0100 |
parents | ca99a807b025 |
children | 0d3ccd5a2509 |
comparison
equal
deleted
inserted
replaced
4800:b828e06dbe38 | 4801:591091481f20 |
---|---|
258 DEFUN("fc-name-unparse", Ffc_name_unparse, 1, 1, 0, /* | 258 DEFUN("fc-name-unparse", Ffc_name_unparse, 1, 1, 0, /* |
259 Unparse an fc pattern object to a string. | 259 Unparse an fc pattern object to a string. |
260 */ | 260 */ |
261 (pattern)) | 261 (pattern)) |
262 { | 262 { |
263 FcChar8 *name; | |
264 Lisp_Object result; | |
263 CHECK_FCPATTERN(pattern); | 265 CHECK_FCPATTERN(pattern); |
264 return build_fcapi_string (FcNameUnparse (XFCPATTERN_PTR (pattern))); | 266 name = FcNameUnparse (XFCPATTERN_PTR (pattern)); |
267 result = build_fcapi_string (name); | |
268 xfree (name, FcChar8 *); | |
269 return result; | |
265 } | 270 } |
266 | 271 |
267 DEFUN("fc-pattern-duplicate", Ffc_pattern_duplicate, 1, 1, 0, /* | 272 DEFUN("fc-pattern-duplicate", Ffc_pattern_duplicate, 1, 1, 0, /* |
268 Make a copy of the fc pattern object PATTERN and return it. | 273 Make a copy of the fc pattern object PATTERN and return it. |
269 */ | 274 */ |