Merged in changes from CVS trunk.

Patches applied:

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-221
   Restore deleted tagline in etc/TUTORIAL.ru

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

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

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

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


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

1 files changed, 41 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c9cf12dc159..702f3be6046 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,39 @@
+2004-04-16  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * buffer.c (Fbuffer_base_buffer): Doc fix.
+
+2004-04-17  Kim F. Storm  <storm@cua.dk>
+
+        * keymap.c (Fkey_description): Add optional PREFIX arg.
+        Combine prefix with KEYS to make up the full key sequence to describe.
+        Correlate meta_prefix_char and following (simple) key to describe
+        as meta modifier.  All callers changed.
+        (describe_map): Rename arg `keys' to `prefix'.  Remove local
+        `elt_prefix' var.  Use Fkey_description with prefix instead of
+        elt_prefix combined with Fsingle_key_description.
+        (describe_vector): Declare static.  Replace arg `elt_prefix' with
+        `prefix'.  Add KEYMAP_P arg.  Add local var `elt_prefix'; use it
+        if !KEYMAP_P. Use Fkey_description with prefix instead of
+        Fsingle_key_description.
+
+        * keymap.h (Fkey_description): Fix prototype.
+        (describe_vector): Remove prototype.
+
+        * xdisp.c (update_overlay_arrows): Fix handling of up_to_date < 0.
+
+        * image.c (PNG_BG_COLOR_SHIFT): Remove.
+        (png_load): Fix calculation of transparent background color on X
+        and W32 platforms.
+
+2004-04-16  Juanma Barranquero  <lektu@terra.es>
+
+        * xdisp.c (try_scrolling): Make sure `scroll-conservatively' is
+        not too large before computing how much to scroll.
+
+2004-04-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * dired.c (Ffile_attributes): Don't pass extra nil arg to file-handler.
+
 2004-04-14  Luc Teirlinck  <teirllm@auburn.edu>
 
         * fileio.c (Fverify_visited_file_modtime, Fvisited_file_modtime):
@@ -30,6 +66,11 @@
         centering_position = 0.
         Clear desired matrix before retrying with centering_position = 0.
 
+2004-04-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * syntax.c (scan_lists): Simplify backward string scan.
+        Fix off-by-one boundary check for string and comment fences.
+
 2004-04-13  Joe Buehler  <jbuehler@hekimian.com>
 
         * sheap.c, unexcw.c: New files.