(syms_of_w32fns): Initialize w32_visible_system_caret_hwnd.

1 files changed, 5 insertions, 3 deletions

diff --git a/src/w32fns.c b/src/w32fns.c
index 1ab46faac47..beb61281794 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -321,7 +321,7 @@ extern int w32_system_caret_x;
 extern int w32_system_caret_y;
 extern int w32_use_visible_system_caret;
 
-HWND w32_visible_system_caret_hwnd;
+static HWND w32_visible_system_caret_hwnd;
 
 
 /* Error if we are not connected to MS-Windows.  */
@@ -4879,9 +4879,9 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
       /* Relinquish the system caret.  */
       if (w32_system_caret_hwnd)
         {
-          DestroyCaret ();
-          w32_system_caret_hwnd = NULL;
           w32_visible_system_caret_hwnd = NULL;
+          w32_system_caret_hwnd = NULL;
+          DestroyCaret ();
         }
     case WM_MOVE:
     case WM_SIZE:
@@ -14467,6 +14467,8 @@ syms_of_w32fns ()
   track_mouse_event_fn = GetProcAddress (user32_lib, "TrackMouseEvent");
   track_mouse_window = NULL;
 
+  w32_visible_system_caret_hwnd = NULL;
+
   /* The section below is built by the lisp expression at the top of the file,
      just above where these variables are declared.  */
   /*&&& init symbols here &&&*/