From: Gerd Moellmann <gerd@gnu.org>
Date: Fri, 18 Aug 2000 05:16:45 +0000 (+0000)
Subject: (redisplay_internal): Compare windows for equality with
X-Git-Tag: emacs-pretest-21.0.90~2185
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=97a36635d1304d7dc4a0bb63e6dc1b46c8cbf862;p=emacs.git

(redisplay_internal): Compare windows for equality with
EQ, instead of applying XWINDOW to something that might not
be a window.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index c27876623a1..c7d8f2db748 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7631,7 +7631,7 @@ redisplay_internal (preserve_echo_area)
 	    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 @@ redisplay_internal (preserve_echo_area)
 	 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 @@ update:
 	  /* 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)