Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-7

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-52
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-53
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-54
   Update from CVS: lisp/cus-start.el (all): Add `undo-outer-limit'.

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-55
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-57
   Update from CVS

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-8
 - miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-11
   Update from CVS

7 files changed, 218 insertions, 161 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e9a38a7d64c..3bb83dc10e2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,38 @@
+2005-01-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keymap.c (access_keymap): YAILOM.
+
+2005-01-27  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (get_phys_cursor_geometry): New function to calculate
+        phys cursor position and size for hollow cursor.  Position is
+        aligned with get_glyph_string_clip_rect and ensures that a hollow
+        cursor is shown, even when the actual glyph is not visible.
+
+        * dispextern.h (get_phys_cursor_geometry): Add prototype.
+
+        * xterm.c (x_clip_to_row): Ensure y >= 0.
+        (x_draw_hollow_cursor): Use get_phys_cursor_geometry.
+
+        * w32term.c (x_draw_hollow_cursor): Use get_phys_cursor_geometry.
+
+        * macterm.c (x_draw_hollow_cursor): Use get_phys_cursor_geometry.
+
+2005-01-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xterm.c (x_error_quitter): Add a prototype.  Make it static again.
+
+2005-01-27  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (get_glyph_string_clip_rect): Always show a cursor
+        glyph, even when row is only partially visible and actual cursor
+        position is not visible.
+
+2005-01-24  Richard M. Stallman  <rms@gnu.org>
+
+        * xterm.c (x_error_quitter): No longer static, and moved after
+        x_error_handler.
+
 2005-01-24  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (move_it_by_lines): If we move forward after going too
@@ -51,7 +86,7 @@
 2005-01-22  Steven Tamm  <steventamm@mac.com>
 
         * s/darwin.h: Removed PTY_ITERATION from here.
-        (DARWIN): Defined.
+        (DARWIN): Define.
         * process.c (init_process): Default process-connection-type to
         nil on darwin 6 or less, t if it is 7 or higher.  This way the
         broken pty behavior is still allowed on darwin 6 for interactive
@@ -94,17 +129,16 @@
 
 2005-01-20  Steven Tamm  <steventamm@mac.com>
 
-        * editfns.c (Voperating_system_release): Added.
+        * editfns.c (Voperating_system_release): Add.
         (init_editfns): Assign new variable operating-system-release
         based on call to uname if available.
-        (get_operating_system_release): Added function to
+        (get_operating_system_release): Add function to
         allow c-level access to operating system release.
 
         * config.h: Regenerated.
 
-        * s/darwin.h (PTY_ITERATION): Don't allow PTYs on darwin 6 or
-        less.
-        (MIN_PTY_KERNEL_VERSION): Defined minimum kernel version for
+        * s/darwin.h (PTY_ITERATION): Don't allow PTYs on darwin 6 or less.
+        (MIN_PTY_KERNEL_VERSION): Define minimum kernel version for
         using ptys as '7'.
 
 2005-01-20  Kim F. Storm  <storm@cua.dk>
@@ -146,8 +180,8 @@
 
 2005-01-17  Kim F. Storm  <storm@cua.dk>
 
-        * dispnew.c (mode_line_string, marginal_area_string): Fix
-        off-by-one error in search for glyph.
+        * dispnew.c (mode_line_string, marginal_area_string):
+        Fix off-by-one error in search for glyph.
 
 2005-01-16  Kim F. Storm  <storm@cua.dk>
 
@@ -155,7 +189,7 @@
 
 2005-01-16  Steven Tamm  <steventamm@mac.com>
 
-        * macterm.c (mac_to_x_fontname): Removed spurious argument.
+        * macterm.c (mac_to_x_fontname): Remove spurious argument.
 
 2005-01-16  Andreas Schwab  <schwab@suse.de>
 
@@ -171,7 +205,7 @@
         * keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
         (READABLE_EVENTS_FILTER_EVENTS, READABLE_EVENTS_IGNORE_SQUEEZABLES):
         New flags for readable_events.
-        (get_filtered_input_pending, readable_filtered_events): Removed.
+        (get_filtered_input_pending, readable_filtered_events): Remove.
         (tracking_off): Call readable_events and get_input_pending with
         flag READABLE_EVENTS_DO_TIMERS_NOW.
         (readable_events): Move code from old readable_filtered_events here,
@@ -211,8 +245,8 @@
 
 2005-01-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-        * macfns.c (x_set_foreground_color, x_set_background_color): Sync
-        with xfns.c.
+        * macfns.c (x_set_foreground_color, x_set_background_color):
+        Sync with xfns.c.
         (mac_window, x_create_tip_frame): Use XSetWindowBackground.
         * macterm.c (XSetBackground, XSetWindowBackground): New functions.
         * macterm.h (XSetBackground, XSetWindowBackground): Add externs.
@@ -269,8 +303,8 @@
         (get_next_display_element): Test Vshow_nonbreak_escape.
         Do not setup escape_glyph_face.
         Properly merge escape-glyph face or face from display table with
-        current face for escape and control characters.  Set
-        it->dpvec_face_id to relevant face id instead of adding it to each
+        current face for escape and control characters.
+        Set it->dpvec_face_id to relevant face id instead of adding it to each
         element of display vector.
         (next_element_from_display_vector): If it->dpvec_face_id is set,
         use that instead of lface_id from glyph itself.
@@ -294,8 +328,7 @@
 
         * gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
         (xg_tool_bar_callback, xg_tool_bar_help_callback)
-        (update_frame_tool_bar): Cast to EMACS_INT to avoid compiler
-        warning.
+        (update_frame_tool_bar): Cast to EMACS_INT to avoid compiler warning.
 
         * xselect.c (x_get_foreign_selection, x_fill_property_data)
         (Fx_get_atom_name, Fx_send_client_event): Replace XFLOAT with
@@ -353,8 +386,8 @@
         [TARGET_API_MAC_CARBON] (mac_do_receive_drag): Likewise.
         [TARGET_API_MAC_CARBON] (mac_do_receive_drag): Return error when a
         file dialog is in action.
-        [TARGET_API_MAC_CARBON] (mac_do_track_drag): Likewise.  Reject
-        only when there are no filename items.  Set background color
+        [TARGET_API_MAC_CARBON] (mac_do_track_drag): Likewise.
+        Reject only when there are no filename items.  Set background color
         before (un)highlighting the window below the dragged items.
         (XTread_socket) [!USE_CARBON_EVENTS]: Don't call do_window_update.
 
@@ -438,8 +471,7 @@
 
         * fileio.c (Finsert_file_contents): Don't use
         current_buffer->buffer_file_coding_system even if REPLACE is
-        non-nil.  Call Qafter_insert_file_set_coding with the second arg
-        VISIT.
+        non-nil.  Call Qafter_insert_file_set_coding with the second arg VISIT.
 
         * fontset.h (struct font_info): New members space_width and
         average_width.
@@ -452,8 +484,7 @@
         * xterm.c (x_new_font): Set FRAME_COLUMN_WIDTH to
         fontp->average_width, not FONT_WIDTH.  Set FRAME_SPACE_WIDTH to
         fontp->space_width.
-        (x_load_font): Calculate fontp->space_width and
-        fontp->average_width.
+        (x_load_font): Calculate fontp->space_width and fontp->average_width.
         (x_term_init): Initialize dpyinfo->Xatom_AVERAGE_WIDTH.
 
         * xdisp.c (x_produce_glyphs): Calculate tab width by
@@ -462,8 +493,7 @@
 2004-12-29  Sanghyuk Suh  <han9kin@mac.com>
 
         * macterm.c (SelectionRange): Add Xcode position apple event struct.
-        (do_ae_open_documents): Handle Xcode-style file position open
-        events.
+        (do_ae_open_documents): Handle Xcode-style file position open events.
 
 2004-12-29  Luc Teirlinck  <teirllm@auburn.edu>
 
@@ -489,11 +519,16 @@
         init_mac_drag_n_drop.
         (mac_do_track_drag): New function and declaration.
         (install_window_handler): Return OSErr value.
-        (install_window_handler) [TARGET_API_MAC_CARBON]: Register
-        handlers for tracking/receiving drag-and-drop items.
+        (install_window_handler) [TARGET_API_MAC_CARBON]:
+        Register handlers for tracking/receiving drag-and-drop items.
         (do_ae_open_documents): Generate unibyte strings for filenames.
-        (mac_do_receive_drag) [TARGET_API_MAC_CARBON] : Likewise.  Reject
-        only non-filename items.  Set event modifiers.  Set return value.
+<<<<<<< ChangeLog
+        (mac_do_receive_drag) [TARGET_API_MAC_CARBON] : Likewise.
+        Reject only non-filename items.  Set event modifiers and return value.
+=======
+        (mac_do_receive_drag) [TARGET_API_MAC_CARBON] : Likewise.
+        Reject only non-filename items.  Set event modifiers, and return value.
+>>>>>>> 1.4187
 
 2004-12-28  Dan Nicolaescu  <dann@ics.uci.edu>
 
@@ -517,8 +552,8 @@
         * xmenu.c (popup_get_selection): Only pop down dialogs
         on C-g and Escape.
         (popup_get_selection): Remove parameter down_on_keypress.
-        (create_and_show_popup_menu, create_and_show_dialog): Remove
-        parameter down_on_keypress to popup_get_selection.
+        (create_and_show_popup_menu, create_and_show_dialog):
+        Remove parameter down_on_keypress to popup_get_selection.
 
 2004-12-27  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
@@ -535,8 +570,8 @@
 
         * frame.c (x_set_frame_parameters, x_report_frame_params)
         (x_set_fullscreen): Remove #ifndef HAVE_CARBON.
-        (x_set_border_width, Vdefault_frame_scroll_bars): Change
-        HAVE_CARBON to MAC_OS.
+        (x_set_border_width, Vdefault_frame_scroll_bars):
+        Change HAVE_CARBON to MAC_OS.
 
         * image.c [MAC_OS]: Include sys/stat.h.
         [MAC_OS && !MAC_OSX]: Include sys/param.h, ImageCompression.h, and
@@ -544,8 +579,7 @@
 
         * mac.c [!MAC_OSX] (mac_wait_next_event): Add extern.
         [!MAC_OSX] (select): Use mac_wait_next_event.
-        [!MAC_OSX] (run_mac_command): Change EXEC_SUFFIXES to
-        Vexec_suffixes.
+        [!MAC_OSX] (run_mac_command): Change EXEC_SUFFIXES to Vexec_suffixes.
         [!MAC_OSX] (select, run_mac_command): Change `#ifdef
         TARGET_API_MAC_CARBON' to `#if TARGET_API_MAC_CARBON'.
         (mac_clear_font_name_table): Add extern.
@@ -564,21 +598,19 @@
         * macfns.c (mac_initialized): Remove extern.
         (stricmp): Put in #if 0.  All callers changed to use xstricmp in
         xfaces.c.
-        (strnicmp): Decrement `n' at the end of each loop, not the
-        beginning.
-        (check_mac): Use the term "Mac native windows" instead of "Mac
-        OS".
+        (strnicmp): Decrement `n' at the end of each loop, not the beginning.
+        (check_mac): Use the term "Mac native windows" instead of "Mac OS".
         (check_x_display_info, x_display_info_for_name): Sync with xfns.c.
         (mac_get_rdb_resource): New function (from w32reg.c).
         (x_get_string_resource): Use it.
         (install_window_handler): Add extern.
         (mac_window): New function.
-        (Fx_create_frame): Use it instead of make_mac_frame.  Set
-        parameter for Qfullscreen.  Call x_wm_set_size_hint.
+        (Fx_create_frame): Use it instead of make_mac_frame.
+        Set parameter for Qfullscreen.  Call x_wm_set_size_hint.
         (Fx_open_connection, Fx_close_connection): New defuns.
         (syms_of_macfns): Defsubr them.
-        (x_create_tip_frame) [TARGET_API_MAC_CARBON]: Add
-        kWindowNoUpdatesAttribute to the window attribute.
+        (x_create_tip_frame) [TARGET_API_MAC_CARBON]:
+        Add kWindowNoUpdatesAttribute to the window attribute.
         (x_create_tip_frame) [!TARGET_API_MAC_CARBON]: Use NewCWindow.
         (x_create_tip_frame): Don't call ShowWindow.
         (Fx_show_tip): Call ShowWindow.
@@ -587,8 +619,7 @@
         (mac_frame_parm_handlers): Set handlers for Qfullscreen.
         (syms_of_macfns) [MAC_OSX]: Initialize mac_in_use to 0.
 
-        * macgui.h [!MAC_OSX]: Don't include Controls.h.  Include
-        Windows.h.
+        * macgui.h [!MAC_OSX]: Don't include Controls.h.  Include Windows.h.
         (Window): Typedef to WindowPtr and move outside `#if
         TARGET_API_MAC_CARBON'.
         (XSizeHints): New struct.
@@ -607,8 +638,12 @@
         (x_make_frame_visible) [TARGET_API_MAC_CARBON]: Reposition window
         if the position is neither user-specified nor program-specified.
         (x_free_frame_resources): Free size_hints.
-        (x_wm_set_size_hint): Allocate size_hints if needed.  Set
-        size_hints.
+<<<<<<< ChangeLog
+        (x_wm_set_size_hint): Allocate size_hints if needed.
+        Set size_hints.
+=======
+        (x_wm_set_size_hint): Allocate size_hints if needed.  Set size_hints.
+>>>>>>> 1.4187
         (mac_clear_font_name_table): New function.
         (mac_do_list_fonts): Initialize font_name_table if needed.
         (x_list_fonts): Don't initialize font_name_table.  Add BLOCK_INPUT
@@ -622,8 +657,7 @@
         (do_window_update): Add BeginUpdate/EndUpdate for the tooltip
         window.  Use UpdateControls.  Get the rectangle that should be
         updated and restrict the target of expose_frame to it.
-        (do_grow_window): Set minimum height/width according to
-        size_hints.
+        (do_grow_window): Set minimum height/width according to size_hints.
         (do_grow_window) [TARGET_API_MAC_CARBON]: Use ResizeWindow.
         (do_zoom_window): Don't use x_set_window_size.
         [USE_CARBON_EVENTS] (mac_handle_window_event): New function.
@@ -635,10 +669,10 @@
         (XTread_socket) [!USE_CARBON_EVENTS]: Use mac_wait_next_event.
         Update mouse_region when mouse is moved.
         (make_mac_frame): Remove.
-        (make_mac_terminal_frame): Put in #ifdef MAC_OS8.  Initialize
-        mouse pointer shapes.  Change values of f->left_pos and
-        f->top_pos.  Don't use make_mac_frame.  Use NewCWindow.  Don't
-        call ShowWindow.
+        (make_mac_terminal_frame): Put in #ifdef MAC_OS8.
+        Initialize mouse pointer shapes.  Change values of f->left_pos and
+        f->top_pos.  Don't use make_mac_frame.  Use NewCWindow.
+        Don't call ShowWindow.
         (mac_initialize_display_info) [MAC_OSX]: Create mac_id_name from
         Vinvocation_name and Vsystem_name.
         (mac_make_rdb): New function (from w32term.c).
@@ -661,17 +695,21 @@
 
 2004-12-27  Richard M. Stallman  <rms@gnu.org>
 
-        * buffer.c (Fbuffer_disable_undo): Deleted (moved to simple.el).
+<<<<<<< ChangeLog
+        * buffer.c (Fbuffer_disable_undo): Delete (moved to simple.el).
+=======
+        * buffer.c (Fbuffer_disable_undo): Delete (move to simple.el).
+>>>>>>> 1.4187
         (syms_of_buffer): Don't defsubr it.
 
         * process.c (list_processes_1): Set undo_list instead
         of calling Fbuffer_disable_undo.
 
-        * xdisp.c (single_display_spec_string_p): Renamed from
+        * xdisp.c (single_display_spec_string_p): Rename from
         single_display_prop_string_p.
-        (single_display_spec_intangible_p): Renamed from
+        (single_display_spec_intangible_p): Rename from
         single_display_prop_intangible_p.
-        (handle_single_display_spec): Renamed from handle_single_display_prop.
+        (handle_single_display_spec): Rename from handle_single_display_prop.
         Rewritten to be easier to understand.
 
         Change in load-history format.  Functions now get (defun . NAME),
@@ -755,7 +793,7 @@
 
         * alloc.c (Fgarbage_collect): Update call to truncate_undo_list.
         Call that at the very start.
-        (undo_limit, undo_strong_limit, undo_outer_limit): Moved to undo.c.
+        (undo_limit, undo_strong_limit, undo_outer_limit): Move to undo.c.
         (syms_of_alloc): Don't define undo-limit,
         undo-strong-limit and undo-outer-limit here.
 
@@ -790,8 +828,8 @@
 
 2004-12-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-        * macterm.c (endif, x_font_name_to_mac_font_name): Use
-        maccentraleurroman instead of maccentraleuropean
+        * macterm.c (endif, x_font_name_to_mac_font_name):
+        Use maccentraleurroman instead of maccentraleuropean
         (mac_c_string_match, mac_do_list_fonts): Speed up font search by
         quickly finding a specific font without needing regexps.
 
@@ -817,8 +855,8 @@
 
         * sysdep.c (select_alarm): Call SIGNAL_THREAD_CHECK.
 
-        * process.c (send_process_trap, sigchld_handler): Call
-        SIGNAL_THREAD_CHECK.
+        * process.c (send_process_trap, sigchld_handler):
+        Call SIGNAL_THREAD_CHECK.
 
         * data.c (arith_error): Call SIGNAL_THREAD_CHECK.
 
@@ -908,7 +946,7 @@
 
         * alloc.c: Add comment about the reason for (UN)BLOCK_INPUT_ALLOC.
 
-2004-12-07  Stefan  <monnier@iro.umontreal.ca>
+2004-12-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * eval.c (init_eval_once): Increase max_specpdl_size to 1000.
 
@@ -2056,7 +2094,7 @@
 
         * window.c (Fspecial_display_p): Doc fix.
 
-2004-10-15  Stefan  <monnier@iro.umontreal.ca>
+2004-10-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * doc.c (Fsubstitute_command_keys): Fix remap-handling.
         Don't ignore menus, because where-is-internal already does it for us.
diff --git a/src/dispextern.h b/src/dispextern.h
index ac56cdd31f2..5edc213fba1 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2640,6 +2640,8 @@ extern void x_fix_overlapping_area P_ ((struct window *, struct glyph_row *,
 extern void draw_phys_cursor_glyph P_ ((struct window *,
                                           struct glyph_row *,
                                           enum draw_glyphs_face));
+extern int get_phys_cursor_geometry P_ ((struct window *, struct glyph_row *,
+                                         struct glyph *, int *));
 extern void erase_phys_cursor P_ ((struct window *));
 extern void display_and_set_cursor P_ ((struct window *,
                                           int, int, int, int, int));
diff --git a/src/keymap.c b/src/keymap.c
index 074cc1706bf..2977b4dec09 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1,6 +1,6 @@
 /* Manipulation of keymaps
-   Copyright (C) 1985, 86,87,88,93,94,95,98,99, 2000, 01, 2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1998, 1999, 2000,
+     2001, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -527,7 +527,7 @@ access_keymap (map, idx, t_ok, noinherit, autoload)
       GCPRO1 (map);
       /* A strange value in which Meta is set would cause
          infinite recursion.  Protect against that.  */
-      if (meta_prefix_char & CHAR_META)
+      if (XINT (meta_prefix_char) & CHAR_META)
         meta_prefix_char = make_number (27);
       meta_map = get_keymap (access_keymap (map, meta_prefix_char,
                                             t_ok, noinherit, autoload),
diff --git a/src/macterm.c b/src/macterm.c
index 9a1ee834ce5..aeed88013e5 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -4737,29 +4737,10 @@ x_draw_hollow_cursor (w, row)
   if (cursor_glyph == NULL)
     return;
 
-  /* Compute the width of the rectangle to draw.  If on a stretch
-     glyph, and `x-stretch-block-cursor' is nil, don't draw a
-     rectangle as wide as the glyph, but use a canonical character
-     width instead.  */
-  wd = cursor_glyph->pixel_width - 1;
-  if (cursor_glyph->type == STRETCH_GLYPH
-      && !x_stretch_cursor_p)
-    wd = min (FRAME_COLUMN_WIDTH (f), wd);
-  w->phys_cursor_width = wd;
-
-  /* Compute frame-relative coordinates from window-relative
-     coordinates.  */
+  /* Compute frame-relative coordinates for phys cursor.  */
   x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x);
-  y = WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y);
-
-  /* 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 (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--;
+  y = get_phys_cursor_geometry (w, row, cursor_glyph, &h);
+  wd = w->phys_cursor_width;
 
   /* The foreground of cursor_gc is typically the same as the normal
      background color, which can cause the cursor box to be invisible.  */
diff --git a/src/w32term.c b/src/w32term.c
index bffdd8f2565..151afb7e841 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -5088,7 +5088,7 @@ x_draw_hollow_cursor (w, row)
   struct frame *f = XFRAME (WINDOW_FRAME (w));
   HDC hdc;
   RECT rect;
-  int wd, h;
+  int h;
   struct glyph *cursor_glyph;
   HBRUSH hb = CreateSolidBrush (f->output_data.w32->cursor_pixel);
 
@@ -5098,34 +5098,12 @@ x_draw_hollow_cursor (w, row)
   if (cursor_glyph == NULL)
     return;
 
-  /* Compute frame-relative coordinates from window-relative
-     coordinates.  */
+  /* Compute frame-relative coordinates for phys cursor.  */
   rect.left = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x);
-  rect.top = (WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y)
-              + row->ascent - w->phys_cursor_ascent);
-
-  /* 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 (min (FRAME_LINE_HEIGHT (f), row->height),
-           cursor_glyph->ascent + cursor_glyph->descent);
-  if (h < row->height)
-    rect.top += row->ascent /* - w->phys_cursor_ascent */ + cursor_glyph->descent - h;
-  h--;
-
+  rect.top = get_phys_cursor_geometry (w, row, cursor_glyph, &h);
   rect.bottom = rect.top + h;
+  rect.right = rect.left + w->phys_cursor_width;
 
-  /* Compute the width of the rectangle to draw.  If on a stretch
-     glyph, and `x-stretch-block-cursor' is nil, don't draw a
-     rectangle as wide as the glyph, but use a canonical character
-     width instead.  */
-  wd = cursor_glyph->pixel_width; /* TODO: Why off by one compared with X? */
-  if (cursor_glyph->type == STRETCH_GLYPH
-      && !x_stretch_cursor_p)
-    wd = min (FRAME_COLUMN_WIDTH (f), wd);
-  w->phys_cursor_width = wd;
-
-  rect.right = rect.left + wd;
   hdc = get_frame_dc (f);
   /* Set clipping, draw the rectangle, and reset clipping again.  */
   w32_clip_to_row (w, row, TEXT_AREA, hdc);
diff --git a/src/xdisp.c b/src/xdisp.c
index a8f36e04e38..7d7e510892b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1840,7 +1840,7 @@ get_glyph_string_clip_rect (s, nr)
   if (s->hl == DRAW_CURSOR)
     {
       struct glyph *glyph = s->first_glyph;
-      int height;
+      int height, max_y;
 
       if (s->x > r.x)
         {
@@ -1849,13 +1849,26 @@ get_glyph_string_clip_rect (s, nr)
         }
       r.width = min (r.width, glyph->pixel_width);
 
-      /* Don't draw cursor glyph taller than our actual glyph.  */
-      height = max (FRAME_LINE_HEIGHT (s->f), glyph->ascent + glyph->descent);
-      if (height < r.height)
+      /* If r.y is below window bottom, ensure that we still see a cursor.  */
+      height = min (glyph->ascent + glyph->descent,
+                    min (FRAME_LINE_HEIGHT (s->f), s->row->visible_height));
+      max_y = window_text_bottom_y (s->w) - height;
+      max_y = WINDOW_TO_FRAME_PIXEL_Y (s->w, max_y);
+      if (s->ybase - glyph->ascent > max_y)
         {
-          int max_y = r.y + r.height;
-          r.y = min (max_y, s->ybase + glyph->descent - height);
-          r.height = min (max_y - r.y, height);
+          r.y = max_y;
+          r.height = height;
+        }
+      else
+        {
+          /* Don't draw cursor glyph taller than our actual glyph.  */
+          height = max (FRAME_LINE_HEIGHT (s->f), glyph->ascent + glyph->descent);
+          if (height < r.height)
+            {
+              max_y = r.y + r.height;
+              r.y = min (max_y, max (r.y, s->ybase + glyph->descent - height));
+              r.height = min (max_y - r.y, height);
+            }
         }
     }
 
@@ -1866,6 +1879,64 @@ get_glyph_string_clip_rect (s, nr)
 #endif
 }
 
+
+/* EXPORT:
+   Return the position and height of the phys cursor in window W.
+   Set w->phys_cursor_width to width of phys cursor.
+*/
+
+int
+get_phys_cursor_geometry (w, row, glyph, heightp)
+     struct window *w;
+     struct glyph_row *row;
+     struct glyph *glyph;
+     int *heightp;
+{
+  struct frame *f = XFRAME (WINDOW_FRAME (w));
+  int x, y, wd, h, h0, y0;
+
+  /* Compute the width of the rectangle to draw.  If on a stretch
+     glyph, and `x-stretch-block-cursor' is nil, don't draw a
+     rectangle as wide as the glyph, but use a canonical character
+     width instead.  */
+  wd = glyph->pixel_width - 1;
+#ifdef HAVE_NTGUI
+  wd++; /* Why? */
+#endif
+  if (glyph->type == STRETCH_GLYPH
+      && !x_stretch_cursor_p)
+    wd = min (FRAME_COLUMN_WIDTH (f), wd);
+  w->phys_cursor_width = wd;
+
+  y = w->phys_cursor.y + row->ascent - glyph->ascent;
+
+  /* If y is below window bottom, ensure that we still see a cursor.  */
+  h0 = min (FRAME_LINE_HEIGHT (f), row->visible_height);
+
+  h = max (h0, glyph->ascent + glyph->descent);
+  h0 = min (h0, glyph->ascent + glyph->descent);
+
+  y0 = WINDOW_HEADER_LINE_HEIGHT (w);
+  if (y < y0)
+    {
+      h = max (h - (y0 - y) + 1, h0);
+      y = y0 - 1;
+    }
+  else
+    {
+      y0 = window_text_bottom_y (w) - h0;
+      if (y > y0)
+        {
+          h += y - y0;
+          y = y0;
+        }
+    }
+
+  *heightp = h - 1;
+  return WINDOW_TO_FRAME_PIXEL_Y (w, y);
+}
+
+
 #endif /* HAVE_WINDOW_SYSTEM */
 
 
diff --git a/src/xterm.c b/src/xterm.c
index a68725a463c..c54b96a19b7 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1,6 +1,6 @@
 /* X Communication module for terminals which understand the X protocol.
-   Copyright (C) 1989, 93, 94, 95, 96, 97, 98, 1999, 2000,01,02,03,04
-   Free Software Foundation, Inc.
+   Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+     2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -7157,7 +7157,7 @@ x_clip_to_row (w, row, area, gc)
   window_box (w, area, &window_x, &window_y, &window_width, 0);
 
   clip_rect.x = window_x;
-  clip_rect.y = WINDOW_TO_FRAME_PIXEL_Y (w, row->y);
+  clip_rect.y = WINDOW_TO_FRAME_PIXEL_Y (w, max (0, row->y));
   clip_rect.y = max (clip_rect.y, window_y);
   clip_rect.width = window_width;
   clip_rect.height = row->visible_height;
@@ -7187,29 +7187,10 @@ x_draw_hollow_cursor (w, row)
   if (cursor_glyph == NULL)
     return;
 
-  /* Compute the width of the rectangle to draw.  If on a stretch
-     glyph, and `x-stretch-block-cursor' is nil, don't draw a
-     rectangle as wide as the glyph, but use a canonical character
-     width instead.  */
-  wd = cursor_glyph->pixel_width - 1;
-  if (cursor_glyph->type == STRETCH_GLYPH
-      && !x_stretch_cursor_p)
-    wd = min (FRAME_COLUMN_WIDTH (f), wd);
-  w->phys_cursor_width = wd;
-
-  /* Compute frame-relative coordinates from window-relative
-     coordinates.  */
+  /* Compute frame-relative coordinates for phys cursor.  */
   x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x);
-  y = WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y);
-
-  /* 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 (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--;
+  y = get_phys_cursor_geometry (w, row, cursor_glyph, &h);
+  wd = w->phys_cursor_width;
 
   /* The foreground of cursor_gc is typically the same as the normal
      background color, which can cause the cursor box to be invisible.  */
@@ -7773,11 +7754,32 @@ x_connection_closed (dpy, error_message)
   error ("%s", error_msg);
 }
 
+/* We specifically use it before defining it, so that gcc doesn't inline it,
+   otherwise gdb doesn't know how to properly put a breakpoint on it.  */
+static void x_error_quitter (Display *display, XErrorEvent *error);
+
+/* This is the first-level handler for X protocol errors.
+   It calls x_error_quitter or x_error_catcher.  */
+
+static int
+x_error_handler (display, error)
+     Display *display;
+     XErrorEvent *error;
+{
+  if (! NILP (x_error_message_string))
+    x_error_catcher (display, error);
+  else
+    x_error_quitter (display, error);
+  return 0;
+}
 
 /* This is the usual handler for X protocol errors.
    It kills all frames on the display that we got the error for.
    If that was the only one, it prints an error message and kills Emacs.  */
 
+/* It is after x_error_handler so that it won't get inlined in
+   x_error_handler.  */
+
 static void
 x_error_quitter (display, error)
      Display *display;
@@ -7795,21 +7797,6 @@ x_error_quitter (display, error)
 }
 
 
-/* This is the first-level handler for X protocol errors.
-   It calls x_error_quitter or x_error_catcher.  */
-
-static int
-x_error_handler (display, error)
-     Display *display;
-     XErrorEvent *error;
-{
-  if (! NILP (x_error_message_string))
-    x_error_catcher (display, error);
-  else
-    x_error_quitter (display, error);
-  return 0;
-}
-
 /* This is the handler for X IO errors, always.
    It kills all frames on the display that we lost touch with.
    If that was the only one, it prints an error message and kills Emacs.  */