2 files changed, 10 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 086c5463c7f..40286abc86b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-31  Eli Zaretskii  <eliz@is.elta.co.il>
+
+        * xdisp.c (get_window_cursor_type): Don't use x_highlight_frame
+        member of x_display_info unless we compile for some window system.
+
 2002-08-31  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (Valternate_cursor_type, Qalternate_cursor_type): Removed.
diff --git a/src/xdisp.c b/src/xdisp.c
index fa63e6ffc5a..f277abee47f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -15320,8 +15320,11 @@ get_window_cursor_type (w, width)
     }
 
   /* Nonselected window or nonselected frame.  */
-  else if (f != FRAME_X_DISPLAY_INFO (f)->x_highlight_frame
-      || w != XWINDOW (f->selected_window))
+  else if (w != XWINDOW (f->selected_window)
+#ifdef HAVE_WINDOW_SYSTEM
+           || f != FRAME_X_DISPLAY_INFO (f)->x_highlight_frame
+#endif
+           )
     {
       if (MINI_WINDOW_P (w) && minibuf_level == 0)
         return NO_CURSOR;