Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-248
   src/lisp.h (CYCLE_CHECK): Macro moved from xfaces.c

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

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

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

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

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

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

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


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

1 files changed, 2 insertions, 1 deletions

diff --git a/src/macterm.c b/src/macterm.c
index 88f5fce468c..e825cc2b022 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -4665,7 +4665,8 @@ x_draw_hollow_cursor (w, row)
   /* Compute the proper height and ascent of the rectangle, based
      on the actual glyph.  Using the full height of the row looks
      bad when there are tall images on that row.  */
-  h = max (FRAME_LINE_HEIGHT (f), cursor_glyph->ascent + cursor_glyph->descent);
+  h = max (min (FRAME_LINE_HEIGHT (f), row->height),
+           cursor_glyph->ascent + cursor_glyph->descent);
   if (h < row->height)
     y += row->ascent /* - w->phys_cursor_ascent */ + cursor_glyph->descent - h;
   h--;