Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-420
   Tweak permissions

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

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

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

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

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

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


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

1 files changed, 28 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6fae7580745..383f479aabd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,11 +1,33 @@
+2004-06-27  Jason Rumney  <jasonr@gnu.org>
+
+        * w32fns.c (file_dialog_callback): Disable edit control if set
+        to directories only on CDN_INITDONE message.
+        (Fx_file_dialog): Default to directories only when prompt starts
+        with "Dired".
+
+2004-06-25  Kim F. Storm  <storm@cua.dk>
+
+        * alloc.c (allocate_misc): Update total_free_markers.
+        (free_misc): New function.
+        (safe_alloca_unwind, free_marker): Use it.
+
+        * lisp.h (free_misc): Add prototype.
+
+        * fns.c (Fmapconcat, Fmapcar): Remove superfluous GCPROs.
+
+2004-06-24  Richard M. Stallman  <rms@gnu.org>
+
+        * emacs.c (Vsignal_USR1_hook, Vsignal_USR2_hook): Definitions deleted.
+        (syms_of_emacs): Lisp variables deleted.
+
 2004-06-23  David Kastrup  <dak@gnu.org>
 
-        * search.c (Freplace_match): Adjust the match-data more
-        thoroughly when replacing strings in the buffer.
-        search.c (match-data): When INTEGERS is non-nil and the last match
-        was in a buffer, add the buffer as last element to the match data.
-        (Fset_match_data): If an additional element of the match-data is
-        a buffer, restore it to last_thing_searched.
+        * search.c (Freplace_match): Adjust the match-data more thoroughly
+        when replacing strings in the buffer.
+        (Fmatch_data): When INTEGERS is non-nil and the last match was in
+        a buffer, add the buffer as last element to the match data.
+        (Fset_match_data): If an additional element of the match-data is a
+        buffer, restore it to last_thing_searched.
         (save_search_regs): Save last_thing_searched as part of the match
         data.
         (restore_match_data): Restore it again.