Merged in changes from CVS trunk.

Patches applied:

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

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


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

1 files changed, 35 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8d9d72de9d2..3e6094bbca0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,40 @@
+2004-07-26  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (move_it_in_display_line_to): If overflow-newline-into-fringe
+        is enabled, return MOVE_LINE_CONTINUED rather than MOVE_POS_MATCH_OR_ZV
+        if target position is at end of display line but char is not a newline.
+
+2004-07-25  Richard M. Stallman  <rms@gnu.org>
+
+        * window.c (coordinates_in_window): Return ON_SCROLL_BAR
+        instead of ON_VERTICAL_BORDER, when on scroll bar.
+        (Fcoordinates_in_window_p): Handle ON_SCROLL_BAR--return nil.
+
+        * dispextern.h (enum window_part): Add ON_SCROLL_BAR.
+
+        * window.c (Fcoordinates_in_window_p):
+        Take account of FRAME_INTERNAL_BORDER_WIDTH.
+
+        * alloc.c (check_cons_list): New function (contents commented out).
+
+2004-07-24  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * xfaces.c (Fcolor_supported_p): Doc fix.
+
+        * frame.c (Fselect_frame, Fset_frame_selected_window)
+        (Fframe_visible_p, Fraise_frame): Doc fixes.
+
 2004-07-24  Richard M. Stallman  <rms@gnu.org>
 
+        * keyboard.h (not_single_kboard_state): Declared.
+
+        * fileio.c (Fwrite_region): Doc fix.
+
+        * window.c (Fwindow_at): Take account of FRAME_INTERNAL_BORDER_WIDTH.
+
+        * abbrev.c (Fexpand_abbrev): Run Qpre_abbrev_expand_hook
+        only when a real abbrev is present.
+
         * xfns.c (x_icon_verify): New function.
         (Fx_create_frame): Use it.