[Emacs-diffs] /srv/bzr/emacs/trunk r100268: * msdos/sed1v2.inp (FONT_OBJ): Use the plain X version (no XFT, Freetype).

[Glenn Morris]

------------------------------------------------------------
revno: 100268
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2010-05-13 19:51:50 -0700
message:
  * msdos/sed1v2.inp (FONT_OBJ): Use the plain X version (no XFT, Freetype).
  Hopefully this is the right thing for msdos with X.
modified:
  msdos/ChangeLog
  msdos/sed1v2.inp

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2010-05-14 02:46:09 +0000
+++ b/msdos/ChangeLog   2010-05-14 02:51:50 +0000
@@ -1,5 +1,7 @@
 2010-05-14  Glenn Morris  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp  2010-05-14 02:46:09 +0000
+++ b/msdos/sed1v2.inp  2010-05-14 02:51:50 +0000
@@ -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/