From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 5 Feb 2001 15:48:00 +0000 (+0000)
Subject: (x_display_and_set_cursor): Check for the focus
X-Git-Tag: emacs-pretest-21.0.98~164
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7a58ab59f4d02fc738e7a02c9da5698f83e28a29;p=emacs.git

(x_display_and_set_cursor): Check for the focus
frame's selected window instead of selected_window.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index f43f38997cb..ab1de851f17 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-02-05  Gerd Moellmann  <gerd@gnu.org>
 
+	* xterm.c (x_display_and_set_cursor): Check for the focus
+	frame's selected window instead of selected_window.
+
 	* xdisp.c (try_scrolling): If point is in the line below the
 	window, make sure to move the iterator at least a canonical
 	char height down.
diff --git a/src/xterm.c b/src/xterm.c
index 3d0b151370d..14a34bd2eca 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10877,8 +10877,8 @@ x_display_and_set_cursor (w, on, hpos, vpos, x, y)
     }
   else
     {
-      if (w != XWINDOW (selected_window)
-	  || f != FRAME_X_DISPLAY_INFO (f)->x_highlight_frame)
+      if (f != FRAME_X_DISPLAY_INFO (f)->x_highlight_frame
+	  || w != XWINDOW (f->selected_window))
 	{
 	  extern int cursor_in_non_selected_windows;