[Emacs-diffs] Changes to emacs/src/w32fns.c

[Jason Rumney]

Index: emacs/src/w32fns.c
diff -c emacs/src/w32fns.c:1.150 emacs/src/w32fns.c:1.151
*** emacs/src/w32fns.c:1.150    Sun Jan 20 18:13:29 2002
--- emacs/src/w32fns.c  Wed Jan 23 16:52:41 2002
***************
*** 321,327 ****
  extern int w32_system_caret_y;
  extern int w32_use_visible_system_caret;
  
! HWND w32_visible_system_caret_hwnd;
  
  
  /* Error if we are not connected to MS-Windows.  */
--- 321,327 ----
  extern int w32_system_caret_y;
  extern int w32_use_visible_system_caret;
  
! static HWND w32_visible_system_caret_hwnd;
  
  
  /* Error if we are not connected to MS-Windows.  */
***************
*** 4879,4887 ****
        /* Relinquish the system caret.  */
        if (w32_system_caret_hwnd)
        {
-         DestroyCaret ();
-         w32_system_caret_hwnd = NULL;
          w32_visible_system_caret_hwnd = NULL;
        }
      case WM_MOVE:
      case WM_SIZE:
--- 4879,4887 ----
        /* Relinquish the system caret.  */
        if (w32_system_caret_hwnd)
        {
          w32_visible_system_caret_hwnd = NULL;
+         w32_system_caret_hwnd = NULL;
+         DestroyCaret ();
        }
      case WM_MOVE:
      case WM_SIZE:
***************
*** 14466,14471 ****
--- 14466,14473 ----
       it dynamically.  Do it once, here, instead of every time it is used.  */
    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.  */