Merged in changes from CVS trunk.

Patches applied:

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-696
   Merge from gnus--rel--5.10

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

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

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-703
   Merge from gnus--rel--5.10

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

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-709
   Update from CVS: src/indent.c (Fvertical_motion): Fix last change.

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

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

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

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

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-72
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-73
   Merge from emacs--cvs-trunk--0

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

diff --cc lisp/bindings.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/font-lock.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/fringe.c
Simple merge

diff --cc src/indent.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/keymap.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/minibuf.c
Simple merge

diff --cc src/w32term.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
index c3f659a,3b7b9d3..a872366
--- 1/src/xdisp.c
--- 2/src/xdisp.c
+++ b/src/xdisp.c
@@@ -20105,9 -20128,10 +20132,10 @@@ erase_phys_cursor (w
  
        x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x);
        y = WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height, cursor_row->y));
 -                 window_box_width (w, TEXT_AREA) - w->phys_cursor.x);
+       width = min (cursor_glyph->pixel_width,
++                   window_box_width (w, TEXT_AREA) - w->phys_cursor.x);
  
-       FRAME_RIF (f)->clear_frame_area (f, x, y,
-                                        cursor_glyph->pixel_width, cursor_row->visible_height);
 -      rif->clear_frame_area (f, x, y, width, cursor_row->visible_height);
++      FRAME_RIF (f)->clear_frame_area (f, x, y, width, cursor_row->visible_height);
      }
  
    /* Erase the cursor by redrawing the character underneath it.  */

diff --cc src/xfns.c
Simple merge

diff --cc src/xmenu.c
Simple merge

diff --cc src/xterm.c
Simple merge

diff --cc src/xterm.h
Simple merge