[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/fontset.c,v
From: |
Adrian Robert |
Subject: |
[Emacs-diffs] Changes to emacs/src/fontset.c,v |
Date: |
Tue, 15 Jul 2008 18:15:42 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Adrian Robert <arobert> 08/07/15 18:15:19
Index: src/fontset.c
===================================================================
RCS file: /sources/emacs/emacs/src/fontset.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -b -r1.140 -r1.141
--- src/fontset.c 14 Jul 2008 07:05:10 -0000 1.140
+++ src/fontset.c 15 Jul 2008 18:15:12 -0000 1.141
@@ -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));
}
- [Emacs-diffs] Changes to emacs/src/fontset.c,v, Kenichi Handa, 2008/07/08
- [Emacs-diffs] Changes to emacs/src/fontset.c,v, Stefan Monnier, 2008/07/09
- [Emacs-diffs] Changes to emacs/src/fontset.c,v, Kenichi Handa, 2008/07/11
- [Emacs-diffs] Changes to emacs/src/fontset.c,v, Kenichi Handa, 2008/07/14
- [Emacs-diffs] Changes to emacs/src/fontset.c,v,
Adrian Robert <=
- [Emacs-diffs] Changes to emacs/src/fontset.c,v, Dan Nicolaescu, 2008/07/27