diff options
| author | Glenn Morris | 2010-05-13 19:51:50 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-05-13 19:51:50 -0700 |
| commit | 2633ef942080bd6ddf157ed821c1ac98f472914d (patch) | |
| tree | 4bc89a903dc667874bdd491df62bd8204a727d6c | |
| parent | 489d31a4552ef516721376d7a43b149650abd7a8 (diff) | |
| download | emacs-2633ef942080bd6ddf157ed821c1ac98f472914d.tar.gz emacs-2633ef942080bd6ddf157ed821c1ac98f472914d.zip | |
* msdos/sed1v2.inp (FONT_OBJ): Use the plain X version (no XFT, Freetype).
Hopefully this is the right thing for msdos with X.
| -rw-r--r-- | msdos/ChangeLog | 2 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index b40f0dc5c96..97c1f62340c 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-05-14 Glenn Morris <rgm@gnu.org> | 1 | 2010-05-14 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * sed1v2.inp (FONT_OBJ): Use the plain X version (no XFT, Freetype). | ||
| 4 | |||
| 3 | * sed1v2.inp (@NS_IMPL_GNUSTEP_INC@): Edit to nil. | 5 | * sed1v2.inp (@NS_IMPL_GNUSTEP_INC@): Edit to nil. |
| 4 | 6 | ||
| 5 | 2010-05-13 Glenn Morris <rgm@gnu.org> | 7 | 2010-05-13 Glenn Morris <rgm@gnu.org> |
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index a89d7264416..4f76f1a97c4 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp | |||
| @@ -99,7 +99,7 @@ s/\.h\.in/.h-in/ | |||
| 99 | /^START_FILES *=/s/@START_FILES@// | 99 | /^START_FILES *=/s/@START_FILES@// |
| 100 | /^OTHER_FILES *=/s/@OTHER_FILES@// | 100 | /^OTHER_FILES *=/s/@OTHER_FILES@// |
| 101 | /^XMENU_OBJ *=/s/@XMENU_OBJ@/xmenu.o/ | 101 | /^XMENU_OBJ *=/s/@XMENU_OBJ@/xmenu.o/ |
| 102 | /^FONT_OBJ *=/s/@FONT_OBJ@/xfont.o ftfont.o xftfont.o ftxfont.o/ | 102 | /^FONT_OBJ *=/s/@FONT_OBJ@/xfont.o/ |
| 103 | /^LIBGPM *=/s/@LIBGPM@// | 103 | /^LIBGPM *=/s/@LIBGPM@// |
| 104 | /^EXEEXT *=/s/@EXEEXT@/.exe/ | 104 | /^EXEEXT *=/s/@EXEEXT@/.exe/ |
| 105 | /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/ | 105 | /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/ |