diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-12-02 17:08:31 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-12-02 17:08:31 -0800 |
| commit | c5bc2d1d0558bbaa29ef04f9bd7bef50146382ab (patch) | |
| tree | beabc46c767d32fe6cda79f0567834d5ea8225ee /msdos | |
| parent | 1bf3989cd4ebffdeeebfaaca83c6866416c3908a (diff) | |
| parent | 328dac0d42a2b395a327c0eda0ed4bbcec4f6c55 (diff) | |
| download | emacs-c5bc2d1d0558bbaa29ef04f9bd7bef50146382ab.tar.gz | |
Merge from emacs-24; up to 2012-11-23T06:23:28Z!cyd@gnu.org
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 5 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 753931ae097..1fdd9316847 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,8 @@ +2012-12-03 Eli Zaretskii <eliz@gnu.org> + + * sed1v2.inp: Dump emacs.exe and copy to b-emacs.exe before + generating leim-list.el. + 2012-11-24 Ken Brown <kbrown@cornell.edu> * sed2v2.inp (HAVE_MOUSE): Remove. diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 84f24bf2c1a..0ee7510bec1 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -157,6 +157,12 @@ s/^ [^ ]*move-if-change / update / /^ echo[ ][ ]*timestamp/s/echo /djecho / /^ .*djecho timestamp/a\ @rm -f gl-tmp +/^ cd \$(leimdir) && \$(MAKE)/i\ + $(RUN_TEMACS) -batch -l loadup dump\ + stubify emacs\ + stubedit emacs.exe minstack=2048k\ + rm -f b-emacs$(EXEEXT)\ + cp emacs$(EXEEXT) b-emacs$(EXEEXT) /^ cd \$(leimdir) && \$(MAKE)/c\ $(MAKE) $(MFLAGS) -C $(leimdir) leim-list.el EMACS=$(bootstrap_exe) /^ cd \$(lib) && \$(MAKE)/c\ |