diff options
| author | Adrian Robert <Adrian.B.Robert@gmail.com> | 2008-07-15 18:15:18 +0000 |
|---|---|---|
| committer | Adrian Robert <Adrian.B.Robert@gmail.com> | 2008-07-15 18:15:18 +0000 |
| commit | edfda78355c5528eee489fa8a7f9c73bf8e734f2 (patch) | |
| tree | 78d2414d9791e1efc17ec9b35b438ae35602340a /src/fontset.c | |
| parent | 1391cd548782097e34d7856ec4f20ca90bdf2c26 (diff) | |
| download | emacs-edfda78355c5528eee489fa8a7f9c73bf8e734f2.tar.gz | |
merging Emacs.app (NeXTstep port)
Diffstat (limited to 'src/fontset.c')
| -rw-r--r-- | src/fontset.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/fontset.c b/src/fontset.c index e4448537458..edcbaa63070 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -47,6 +47,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #ifdef WINDOWSNT #include "w32term.h" #endif +#ifdef HAVE_NS +#include "nsterm.h" +#endif #ifdef MAC_OS #include "macterm.h" #endif @@ -1622,6 +1625,11 @@ fontset_from_font (font_object) 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)); } |