diff options
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/>. */ | |||
| 47 | #ifdef WINDOWSNT | 47 | #ifdef WINDOWSNT |
| 48 | #include "w32term.h" | 48 | #include "w32term.h" |
| 49 | #endif | 49 | #endif |
| 50 | #ifdef HAVE_NS | ||
| 51 | #include "nsterm.h" | ||
| 52 | #endif | ||
| 50 | #ifdef MAC_OS | 53 | #ifdef MAC_OS |
| 51 | #include "macterm.h" | 54 | #include "macterm.h" |
| 52 | #endif | 55 | #endif |
| @@ -1622,6 +1625,11 @@ fontset_from_font (font_object) | |||
| 1622 | ASET (font_spec, i, Qnil); | 1625 | ASET (font_spec, i, Qnil); |
| 1623 | Fset_fontset_font (name, Qlatin, font_spec, Qnil, Qnil); | 1626 | Fset_fontset_font (name, Qlatin, font_spec, Qnil, Qnil); |
| 1624 | Fset_fontset_font (name, Qnil, font_spec, Qnil, Qnil); | 1627 | Fset_fontset_font (name, Qnil, font_spec, Qnil, Qnil); |
| 1628 | |||
| 1629 | #ifdef HAVE_NS | ||
| 1630 | nsfont_make_fontset_for_font(name, font_object); | ||
| 1631 | #endif | ||
| 1632 | |||
| 1625 | return XINT (FONTSET_ID (fontset)); | 1633 | return XINT (FONTSET_ID (fontset)); |
| 1626 | } | 1634 | } |
| 1627 | 1635 | ||