# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1035489503 0
# Node ID 3762c03998174718db94e53b4d3db4eb6e62e597
# Parent  29c0b05e2715058454917e1a8d57680eae947bfd
(x_display_and_set_cursor): Get active_cursor from
get_window_cursor_type to track system caret.

diff -r 29c0b05e2715 -r 3762c0399817 src/w32term.c
--- a/src/w32term.c	Thu Oct 24 19:57:52 2002 +0000
+++ b/src/w32term.c	Thu Oct 24 19:58:23 2002 +0000
@@ -9759,11 +9759,10 @@
   struct frame *f = XFRAME (w->frame);
   int new_cursor_type;
   int new_cursor_width;
+  int active_cursor;
   struct glyph_matrix *current_glyphs;
   struct glyph_row *glyph_row;
   struct glyph *glyph;
-  int cursor_non_selected;
-  int active_cursor = 1;
 
   /* This is pointless on invisible frames, and dangerous on garbaged
      windows and frames; in the latter case, the frame or window may
@@ -9794,7 +9793,7 @@
   xassert (interrupt_input_blocked);
 
   /* Set new_cursor_type to the cursor we want to be displayed.  */
-  new_cursor_type = get_window_cursor_type (w, &new_cursor_width);
+  new_cursor_type = get_window_cursor_type (w, &new_cursor_width, &active_cursor);
 
   /* If cursor is currently being shown and we don't want it to be or
      it is in the wrong place, or the cursor type is not what we want,