Merged in changes from CVS trunk.

Patches applied:

 * lorentey@elte.hu--2004/emacs--hacks--0--patch-2
   Prevent special events from appending dashes to the echo string.

 * lorentey@elte.hu--2004/emacs--hacks--0--patch-4
   Added ChangeLog entry.

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-455
   Bash the dashes

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

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

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

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

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


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

1 files changed, 42 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b3a9386da86..9765ec9403c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,45 @@
+2004-07-17  Juanma Barranquero  <lektu@terra.es>
+
+        * keyboard.c (not_single_kboard_state): Do nothing unless
+        MULTI_KBOARD is defined.
+
+2004-07-17  Richard M. Stallman  <rms@gnu.org>
+
+        * window.c (coordinates_in_window): Inside the window but outside
+        its box to the L or R, return ON_VERTICAL_BORDER.
+        (window_list_1): Rotate the list to start with WINDOW.
+
+        * print.c (print_preprocess): Test for print_depth at limit
+        before entering in being_printed.
+
+        * keyboard.c (not_single_kboard_state): New function.
+        (stuff_buffered_input): Now no-op only if no SIGTSTP.
+
+        * frame.c (Fdelete_frame): If we're in single_bboard_state on
+        this kboard, and we delete its last frame, go to any_kboard_state.
+
+        * buffer.c (syms_of_buffer) <transient-mark-mode>: Doc fix.
+
+2004-07-15  KOBAYASHI Yasuhiro  <kobayays@otsukakj.co.jp>  (tiny change)
+
+        * w32fns.c (Fx_file_dialog): Encode strings in system coding
+        system before passing them to OS functions for display.
+
+2004-07-15  David Kastrup  <dak@gnu.org>
+
+        * search.c (syms_of_search): Staticpro `saved_last_thing_searched'.
+        Apparently fixes an abort condition.
+
+2004-07-14  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * fileio.c (Fvisited_file_modtime): Return a list of two integers,
+        instead of a cons.
+
+2004-07-14  K,Ba(Broly L,Bu(Brentey  <lorentey@elte.hu>
+
+        * keyboard.c (echo_dash): Do nothing if there already is a dash
+        at the end of the echo string.
+
 2004-07-12  Kim F. Storm  <storm@cua.dk>
 
         * alloc.c (mark_object): Only look at Lisp_Misc_Save_Value