Merged in changes from CVS trunk.

Patches applied:

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-257
   {arch}/=cvs-sync-make-log: Use new features of tla-changelogs-to-log


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

1 files changed, 20 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4db9b8cb4d9..c3314cb98e5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,23 @@
+2004-04-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xdisp.c (x_produce_glyphs): Fix the proverbial int/Lisp_Object mixup.
+        (on_hot_spot_p): Make sure we always return a value.
+        (Flookup_image_map): Remove unused var ix and iy.
+        (note_mode_line_or_margin_highlight): Remove unused var `image'.
+
+2004-04-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * msdos.c (init_environment): If one of the TMP... environment
+        variables is set to a drive letter without a trailing slash,
+        append a slash.
+
+2004-04-27  Matthew Mundell  <matt@mundell.ukfsn.org>
+
+        * editfns.c (lisp_time_argument): Provide externally.
+
+        * fileio.c (Fset_file_times): New function.
+        (syms_of_fileio): Intern and staticpro it.
+
 2004-04-27  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (x_produce_glyphs): Fix last change; handle newline in