Merge from trunk

4 files changed, 16 insertions, 2 deletions

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 7df89880410..cc9a63ef12a 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * sedleim.inp (RUN-EMACS): Don't use --multibyte.
+
+2010-08-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * sed1v2.inp (IMAGEMAGICK_LIBS, IMAGEMAGICK_CFLAGS): Edit to empty.
+
+2010-08-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * mainmake.v2 (version): Update due to change in emacs.c.
+
 2010-08-05  Eli Zaretskii  <eliz@gnu.org>
 
         * sed1v2.inp (UNEXEC_OBJ): Edit to unexcoff.o, due to renaming of
diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index 4bb13e367ed..79bd827d8c6 100644
--- a/msdos/mainmake.v2
+++ b/msdos/mainmake.v2
@@ -65,7 +65,7 @@ MAKESHELL=/xyzzy/command
 top_srcdir := $(subst \,/,$(shell cd))
 
 # Find out which version of Emacs this is.
-version := ${shell sed -n -e '/^const char emacs_version/s/^[^"]*\("[^"]*"\).*/\1/p' src/emacs.c}
+version := ${shell sed -n -e '/^static const char emacs_version/s/^[^"]*\("[^"]*"\).*/\1/p' src/emacs.c}
 
 # Q: Do we need to bootstrap?
 # A: Only if we find admin/admin.el, i.e. we are building out of 
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 4be1bccefdf..e9dfc9dea3d 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -88,6 +88,8 @@ s/\.h\.in/.h-in/
 /^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@//
 /^RSVG_LIBS *=/s/@RSVG_LIBS@//
 /^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@//
+/^IMAGEMAGICK_LIBS *=/s/@IMAGEMAGICK_LIBS@//
+/^IMAGEMAGICK_CFLAGS *=/s/@IMAGEMAGICK_CFLAGS@//
 /^WIDGET_OBJ *=/s/@WIDGET_OBJ@//
 /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@//
 /^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o w16select.o/
diff --git a/msdos/sedleim.inp b/msdos/sedleim.inp
index 20da3e64ae5..b5193e665a7 100644
--- a/msdos/sedleim.inp
+++ b/msdos/sedleim.inp
@@ -34,7 +34,7 @@ s|\([ 	]\)echo|\1djecho|g
 
 /RUN-EMACS *=/,/^$/c\
 export EMACSLOADPATH=${buildlisppath}\
-RUN-EMACS = ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte
+RUN-EMACS = ${BUILT-EMACS} -batch --no-init-file --no-site-file
 
 /^      cd ../c\
         ${MAKE} -C ../src ${MFLAGS} emacs