Merge from emacs-24; up to 2012-11-23T06:23:28Z!cyd@gnu.org

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\