diff options
| author | Adrian Robert | 2009-06-08 04:40:17 +0000 |
|---|---|---|
| committer | Adrian Robert | 2009-06-08 04:40:17 +0000 |
| commit | c7eb9816c82b389eb1e7915be531e379275d7df0 (patch) | |
| tree | ed9b93afca2c5e872b0185fcb13e6a00463297e8 /src | |
| parent | c3c122b7620bcb46ccf909af6cb4bc278ca99361 (diff) | |
| download | emacs-c7eb9816c82b389eb1e7915be531e379275d7df0.tar.gz emacs-c7eb9816c82b389eb1e7915be531e379275d7df0.zip | |
nsterm.h (dump_glyphstring): Rename to ns_dump_glyphstring.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/nsterm.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index dfffebc031d..197cfaf9070 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -23,6 +23,8 @@ | |||
| 23 | (nsfont_draw): Handle "automatic" (lookup-table) compositions. | 23 | (nsfont_draw): Handle "automatic" (lookup-table) compositions. |
| 24 | (dump_glyphstring): Rename to ns_dump_glyphstring. | 24 | (dump_glyphstring): Rename to ns_dump_glyphstring. |
| 25 | 25 | ||
| 26 | * nsterm.h (dump_glyphstring): Rename to ns_dump_glyphstring. | ||
| 27 | |||
| 26 | * nsfns.m (Fns_popup_font_panel): Use shared font manager. | 28 | * nsfns.m (Fns_popup_font_panel): Use shared font manager. |
| 27 | 29 | ||
| 28 | * fontset.c (fontset_from_font): Remove NS-specific code. | 30 | * fontset.c (fontset_from_font): Remove NS-specific code. |
diff --git a/src/nsterm.h b/src/nsterm.h index 392c79a278c..7375e3c9fc4 100644 --- a/src/nsterm.h +++ b/src/nsterm.h | |||
| @@ -682,7 +682,7 @@ extern void nsfont_make_fontset_for_font (Lisp_Object name, | |||
| 682 | 682 | ||
| 683 | /* In nsfont, for debugging */ | 683 | /* In nsfont, for debugging */ |
| 684 | struct glyph_string; | 684 | struct glyph_string; |
| 685 | void dump_glyphstring (struct glyph_string *s); | 685 | void ns_dump_glyphstring (struct glyph_string *s); |
| 686 | 686 | ||
| 687 | /* Implemented in nsterm, published in or needed from nsfns. */ | 687 | /* Implemented in nsterm, published in or needed from nsfns. */ |
| 688 | extern Lisp_Object Qfontsize; | 688 | extern Lisp_Object Qfontsize; |