# HG changeset patch # User Adrian Robert # Date 1244436017 0 # Node ID 33a87d18a1f6a04e061896eb538556ba579a041a # Parent 8379b345d5441432180f25eade6ca36f1e903c83 nsterm.h (dump_glyphstring): Rename to ns_dump_glyphstring. diff -r 8379b345d544 -r 33a87d18a1f6 src/ChangeLog --- a/src/ChangeLog Mon Jun 08 04:35:40 2009 +0000 +++ b/src/ChangeLog Mon Jun 08 04:40:17 2009 +0000 @@ -23,6 +23,8 @@ (nsfont_draw): Handle "automatic" (lookup-table) compositions. (dump_glyphstring): Rename to ns_dump_glyphstring. + * nsterm.h (dump_glyphstring): Rename to ns_dump_glyphstring. + * nsfns.m (Fns_popup_font_panel): Use shared font manager. * fontset.c (fontset_from_font): Remove NS-specific code. diff -r 8379b345d544 -r 33a87d18a1f6 src/nsterm.h --- a/src/nsterm.h Mon Jun 08 04:35:40 2009 +0000 +++ b/src/nsterm.h Mon Jun 08 04:40:17 2009 +0000 @@ -682,7 +682,7 @@ /* In nsfont, for debugging */ struct glyph_string; -void dump_glyphstring (struct glyph_string *s); +void ns_dump_glyphstring (struct glyph_string *s); /* Implemented in nsterm, published in or needed from nsfns. */ extern Lisp_Object Qfontsize;