Mercurial > hg > xemacs-beta

comparison src/font-mgr.c @ 5824:6928877dbc26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix breakage caused by previous commit. 2014-10-25 Michael Sperber <mike@xemacs.org> * fontcolor-x.c (x_font_instance_truename): * font-mgr.c (Ffc_name_unparse): * font-mgr.h (PRINT_XFT_PATTERN, PRINT_XFT_PATTERN): Don't modify fontconfig pattern passed in in place.
author Mike Sperber <sperber@deinprogramm.de>
date Sat, 25 Oct 2014 15:59:31 +0200
parents 15b0715c204d
children 5f02d29a2a65
comparison
equal deleted inserted replaced
5823:efb76d6d0c1d 5824:6928877dbc26
264 FcChar8 *name; 264 FcChar8 *name;
265 Lisp_Object result; 265 Lisp_Object result;
266 266
267 CHECK_FC_PATTERN (pattern); 267 CHECK_FC_PATTERN (pattern);
268 /* #### Could use multiple values here to extract and return charset? */ 268 /* #### Could use multiple values here to extract and return charset? */
269 FcPatternDel (XFC_PATTERN_PTR (pattern), FC_CHARSET); 269 {
270 270 FcPattern* temp = FcPatternDuplicate (XFC_PATTERN_PTR (pattern));
271 name = FcNameUnparse (XFC_PATTERN_PTR (pattern)); 271 FcPatternDel (temp, FC_CHARSET);
272 name = FcNameUnparse (XFC_PATTERN_PTR (pattern));
273 FcPatternDestroy (temp);
274 }
272 result = build_fcapi_string (name); 275 result = build_fcapi_string (name);
273 xfree (name); 276 xfree (name);
274 return result; 277 return result;
275 } 278 }
276 279