# HG changeset patch # User Gerd Moellmann # Date 966575805 0 # Node ID 8f6621d33f0bc1097c0cba18b9538dbe10ee9562 # Parent ac162a21c419b47cf6af16a328a2996c358eea7e (redisplay_internal): Compare windows for equality with EQ, instead of applying XWINDOW to something that might not be a window. diff -r ac162a21c419 -r 8f6621d33f0b src/xdisp.c --- a/src/xdisp.c Fri Aug 18 05:05:39 2000 +0000 +++ b/src/xdisp.c Fri Aug 18 05:16:45 2000 +0000 @@ -7631,7 +7631,7 @@ clear_garbaged_frames (); } } - else if (w == XWINDOW (minibuf_window) + else if (EQ (selected_window, minibuf_window) && (current_buffer->clip_changed || XFASTINT (w->last_modified) < MODIFF || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF) @@ -7827,7 +7827,7 @@ then we can't just move the cursor. */ else if (! (!NILP (Vtransient_mark_mode) && !NILP (current_buffer->mark_active)) - && (w == XWINDOW (current_buffer->last_selected_window) + && (EQ (selected_window, current_buffer->last_selected_window) || highlight_nonselected_windows) && NILP (w->region_showing) && NILP (Vshow_trailing_whitespace) @@ -8069,7 +8069,8 @@ /* Record if we are showing a region, so can make sure to update it fully at next redisplay. */ w->region_showing = (!NILP (Vtransient_mark_mode) - && (w == XWINDOW (current_buffer->last_selected_window) + && (EQ (selected_window, + current_buffer->last_selected_window) || highlight_nonselected_windows) && !NILP (XBUFFER (w->buffer)->mark_active) ? Fmarker_position (XBUFFER (w->buffer)->mark)