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

[Pavel Janík]

Index: emacs/src/w32term.c
diff -c emacs/src/w32term.c:1.155 emacs/src/w32term.c:1.156
*** emacs/src/w32term.c:1.155   Sun Mar 31 11:42:29 2002
--- emacs/src/w32term.c Mon Apr  1 08:45:27 2002
***************
*** 172,178 ****
  
  /* Non-zero means autoselect window with the mouse cursor.  */
  
! int x_autoselect_window_p;
  
  /* Non-zero means draw block and hollow cursor as wide as the glyph
     under it.  For example, if a block cursor is over a tab, it will be
--- 172,178 ----
  
  /* Non-zero means autoselect window with the mouse cursor.  */
  
! int autoselect_window_p;
  
  /* Non-zero means draw block and hollow cursor as wide as the glyph
     under it.  For example, if a block cursor is over a tab, it will be
***************
*** 6295,6301 ****
    memcpy (&last_mouse_motion_event, msg, sizeof (last_mouse_motion_event));
    XSETFRAME (last_mouse_motion_frame, frame);
  
!   if (x_autoselect_window_p)
      {
        int area;
        Lisp_Object window;
--- 6295,6302 ----
    memcpy (&last_mouse_motion_event, msg, sizeof (last_mouse_motion_event));
    XSETFRAME (last_mouse_motion_frame, frame);
  
! #if 0 /* Calling Lisp asynchronously is not safe.  */
!   if (autoselect_window_p)
      {
        int area;
        Lisp_Object window;
***************
*** 6314,6319 ****
--- 6315,6321 ----
  
        last_window=window;
      }
+ #endif
  
    if (msg->hwnd != FRAME_W32_WINDOW (frame))
      {
***************
*** 11386,11394 ****
    staticpro (&previous_help_echo);
    help_echo_pos = -1;
  
!   DEFVAR_BOOL ("x-autoselect-window", &x_autoselect_window_p,
      doc: /* *Non-nil means autoselect window with mouse pointer.  */);
!   x_autoselect_window_p = 0;
  
    DEFVAR_BOOL ("w32-use-visible-system-caret",
               &w32_use_visible_system_caret,
--- 11388,11396 ----
    staticpro (&previous_help_echo);
    help_echo_pos = -1;
  
!   DEFVAR_BOOL ("autoselect-window", &autoselect_window_p,
      doc: /* *Non-nil means autoselect window with mouse pointer.  */);
!   autoselect_window_p = 0;
  
    DEFVAR_BOOL ("w32-use-visible-system-caret",
               &w32_use_visible_system_caret,