Mercurial > emacs
diff src/fontset.c @ 96675:d45acf0c8d23
merging Emacs.app (NeXTstep port)
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Tue, 15 Jul 2008 18:15:18 +0000 |
| parents | c99855bde467 |
| children | 9592c50233ab |
line wrap: on
line diff
--- a/src/fontset.c Tue Jul 15 15:45:05 2008 +0000 +++ b/src/fontset.c Tue Jul 15 18:15:18 2008 +0000 @@ -47,6 +47,9 @@ #ifdef WINDOWSNT #include "w32term.h" #endif +#ifdef HAVE_NS +#include "nsterm.h" +#endif #ifdef MAC_OS #include "macterm.h" #endif @@ -1622,6 +1625,11 @@ ASET (font_spec, i, Qnil); Fset_fontset_font (name, Qlatin, font_spec, Qnil, Qnil); Fset_fontset_font (name, Qnil, font_spec, Qnil, Qnil); + +#ifdef HAVE_NS + nsfont_make_fontset_for_font(name, font_object); +#endif + return XINT (FONTSET_ID (fontset)); }