Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-291
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-292
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-293
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-294
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-295
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-296
   Allow restarting an existing debugger session that's exited

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-297
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-298
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-162

2 files changed, 11 insertions, 3 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 8c641f45ae7..c841df23097 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-08  Jason Rumney  <jasonr@gnu.org>
+
+        * makefile.w32-in (lisp1, lisp2): Split lisp to avoid long
+        command-lines.
+
 2004-05-08  Thien-Thi Nguyen  <ttn@gnu.org>
 
         * cvtmail.c: Throughout, replace 0 destined for `exit' arg
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index c4c2604d113..a997d324a5b 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -139,7 +139,7 @@ WINNT_SUPPORT = $(lispsource)ls-lisp.elc $(lispsource)disp-table.elc $(lispsourc
 MSDOS_SUPPORT = $(lispsource)dos-fns.elc $(lispsource)dos-vars.elc $(lispsource)international/ccl.elc $(lispsource)international/codepage.elc
 VMS_SUPPORT = $(lispsource)vmsproc.elc $(lispsource)vms-patch.elc
 
-lisp= \
+lisp1= \
         $(lispsource)abbrev.elc \
         $(lispsource)buff-menu.elc \
         $(lispsource)button.elc \
@@ -178,7 +178,9 @@ lisp= \
         $(lispsource)international/latin-5.el \
         $(lispsource)international/latin-8.el \
         $(lispsource)international/latin-9.el \
-        $(lispsource)case-table.elc \
+        $(lispsource)case-table.elc
+
+lisp2 = \
         $(lispsource)language/chinese.elc \
         $(lispsource)language/cyrillic.elc \
         $(lispsource)language/indian.elc \
@@ -228,7 +230,8 @@ DOC	      = DOC
 $(DOC):         make-docfile
                 - $(DEL) $(DOC)
                 "$(THISDIR)/$(BLD)/make-docfile" -o $(DOC) -d ../src $(obj)
-                "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp)
+                "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp1)
+                "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp2)
                 $(CP) $(DOC) ../etc/DOC-X
                 - mkdir "../src/$(OBJDIR)"
                 - mkdir "../src/$(OBJDIR)/etc"