Mercurial > emacs
changeset 108547:29bd94ba8c02
* msdos/sed1v2.inp (FONT_OBJ): Use the plain X version (no XFT, Freetype).
Hopefully this is the right thing for msdos with X.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Thu, 13 May 2010 19:51:50 -0700 |
parents | 8039fa319d6b |
children | 2a91d2a1b873 |
files | msdos/ChangeLog msdos/sed1v2.inp |
diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/msdos/ChangeLog Thu May 13 19:46:09 2010 -0700 +++ b/msdos/ChangeLog Thu May 13 19:51:50 2010 -0700 @@ -1,5 +1,7 @@ 2010-05-14 Glenn Morris <rgm@gnu.org> + * sed1v2.inp (FONT_OBJ): Use the plain X version (no XFT, Freetype). + * sed1v2.inp (@NS_IMPL_GNUSTEP_INC@): Edit to nil. 2010-05-13 Glenn Morris <rgm@gnu.org>
--- a/msdos/sed1v2.inp Thu May 13 19:46:09 2010 -0700 +++ b/msdos/sed1v2.inp Thu May 13 19:51:50 2010 -0700 @@ -99,7 +99,7 @@ /^START_FILES *=/s/@START_FILES@// /^OTHER_FILES *=/s/@OTHER_FILES@// /^XMENU_OBJ *=/s/@XMENU_OBJ@/xmenu.o/ -/^FONT_OBJ *=/s/@FONT_OBJ@/xfont.o ftfont.o xftfont.o ftxfont.o/ +/^FONT_OBJ *=/s/@FONT_OBJ@/xfont.o/ /^LIBGPM *=/s/@LIBGPM@// /^EXEEXT *=/s/@EXEEXT@/.exe/ /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/