(x_display_and_set_cursor): Get active_cursor from

get_window_cursor_type to track system caret.

diff --git a/src/w32term.c b/src/w32term.c
index acf06daee31717bc781fdb3cfa463a2eb8c08440..f8d4e2e664e319d9ac5b05619b7ff358e7e7a984 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -9759,11 +9759,10 @@ x_display_and_set_cursor (w, on, hpos, vpos, x, y)
   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 @@ x_display_and_set_cursor (w, on, hpos, vpos, x, y)
   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,