2 files changed, 9 insertions, 1 deletions

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 887d66c0b46..90633433469 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * mainmake.v2 (src) <gdb.ini>: Don't replace the line with
+        x_error_quitter; instead, append "set environment NAME" to the end.
+        Set NAME and USERNAME in the environment to the same value.
+
 2009-02-28  Eli Zaretskii  <eliz@gnu.org>
 
         * mainmake.v2 (boot): Don't require b-emacs.exe if not building
diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index c77c41a2ba5..2cad495a1de 100644
--- a/msdos/mainmake.v2
+++ b/msdos/mainmake.v2
@@ -104,9 +104,11 @@ src: FRC
         $(MAKE) top_srcdir=${top_srcdir} BOOTSTRAPEMACS="${boot}"
         djecho -s '/-geometry/s,^.*,set environment HOME $(top_srcdir),' \
                   '/environment *TERM/s/^.*/set environment TERM internal/' \
-                  '/x_error_quitter/s/^.*/set environment NAME root/' >gdb.sed
+               >gdb.sed
         sed -f gdb.sed _gdbinit >gdb.tmp
         djecho -a gdb.tmp -s 'set environment USER root' \
+                             'set environment NAME root' \
+                             'set environment USERNAME root' \
                              'set environment EMACSPATH $(top_srcdir)/bin' \
                              'set environment SHELL $(subst \,/,$(COMSPEC))' \
                              'set environment PATH $(subst \,/,$(PATH))'