Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-362
   Support " [...]" style defaults in minibuffer-electric-default-mode

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-363
   (read-number): Use canonical format for default in prompt.

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

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


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

2 files changed, 9 insertions, 4 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index ac789eb3181..9f3fcc13371 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,6 +1,11 @@
+2004-06-01  Juanma Barranquero  <lektu@terra.es>
+
+        * makefile.w32-in (obj): Add image.c.
+
 2004-05-10  Thien-Thi Nguyen  <ttn@gnu.org>
 
-        * test-distrib.c (main): For failing cases, exit with `EXIT_FAILURE'.
+        * test-distrib.c (main): For failing cases, exit with
+        `EXIT_FAILURE'.
 
 2004-05-08  Jason Rumney  <jasonr@gnu.org>
 
@@ -14,8 +19,8 @@
         (main): Use `EXIT_SUCCESS' or `EXIT_FAILURE' for return value.
 
         * ebrowse.c, emacsclient.c, fakemail.c, hexl.c,
-        make-docfile.c, movemail.c, profile.c, sorted-doc.c,
-        test-distrib.c, update-game-score.c, yow.c: Likewise.
+        * make-docfile.c, movemail.c, profile.c, sorted-doc.c,
+        * test-distrib.c, update-game-score.c, yow.c: Likewise.
 
 2004-05-08  Thien-Thi Nguyen  <ttn@gnu.org>
 
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index a997d324a5b..3b53a29889b 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -126,7 +126,7 @@ $(BLD)/ctags.$(O): ctags.c
 #
 # From ..\src\makefile.nt.
 #
-obj = abbrev.c alloc.c alloca.c buffer.c bytecode.c callint.c callproc.c casefiddle.c casetab.c category.c ccl.c charset.c cm.c cmds.c coding.c data.c dired.c dispnew.c doc.c doprnt.c editfns.c emacs.c eval.c fileio.c filelock.c filemode.c floatfns.c fns.c fontset.c frame.c fringe.c gmalloc.c indent.c insdel.c intervals.c keyboard.c keymap.c lastfile.c lread.c macros.c marker.c minibuf.c print.c process.c ralloc.c regex.c region-cache.c scroll.c search.c sound.c strftime.c syntax.c sysdep.c term.c termcap.c textprop.c tparam.c undo.c unexw32.c vm-limit.c w32.c w32console.c w32fns.c w32heap.c w32inevt.c w32menu.c w32proc.c w32reg.c w32select.c w32term.c w32xfns.c window.c xdisp.c xfaces.c xfaces.c
+obj = abbrev.c alloc.c alloca.c buffer.c bytecode.c callint.c callproc.c casefiddle.c casetab.c category.c ccl.c charset.c cm.c cmds.c coding.c data.c dired.c dispnew.c doc.c doprnt.c editfns.c emacs.c eval.c fileio.c filelock.c filemode.c floatfns.c fns.c fontset.c frame.c fringe.c gmalloc.c image.c indent.c insdel.c intervals.c keyboard.c keymap.c lastfile.c lread.c macros.c marker.c minibuf.c print.c process.c ralloc.c regex.c region-cache.c scroll.c search.c sound.c strftime.c syntax.c sysdep.c term.c termcap.c textprop.c tparam.c undo.c unexw32.c vm-limit.c w32.c w32console.c w32fns.c w32heap.c w32inevt.c w32menu.c w32proc.c w32reg.c w32select.c w32term.c w32xfns.c window.c xdisp.c xfaces.c xfaces.c
 #
 # These are the lisp files that are loaded up in loadup.el
 #