Rename autoselect_window_p to mouse_autoselect_window.

src/msdos.c

@@ -1195,9 +1195,9 @@ static int help_echo_pos;
 
 /* Non-zero means automatically select any window when the mouse
    cursor moves into it.  */
-int autoselect_window_p;
+int mouse_autoselect_window;
 
-/* Last window where we saw the mouse.  Used by autoselect-window.  */
+/* Last window where we saw the mouse.  Used by mouse-autoselect-window.  */
 static Lisp_Object last_mouse_window;
 
 static int mouse_preempted = 0;	/* non-zero when XMenu gobbles mouse events */
@@ -3411,7 +3411,7 @@ dos_rawgetc ()
 	    }
 
 	  /* Generate SELECT_WINDOW_EVENTs when needed.  */
-	  if (autoselect_window_p)
+	  if (mouse_autoselect_window)
 	    {
 	      int mouse_area;
 
@@ -5366,9 +5366,9 @@ syms_of_msdos ()
 This variable is used only by MSDOS terminals.  */);
   Vdos_unsupported_char_glyph = '\177';
 
-  DEFVAR_BOOL ("autoselect-window", &autoselect_window_p,
+  DEFVAR_BOOL ("mouse-autoselect-window", &mouse_autoselect_window,
     doc: /* *Non-nil means autoselect window with mouse pointer.  */);
-  autoselect_window_p = 0;
+  mouse_autoselect_window_p = 0;
 #endif
 #ifndef subprocesses
   DEFVAR_BOOL ("delete-exited-processes", &delete_exited_processes,

src/w32term.c

@@ -172,7 +172,7 @@ static int any_help_event_p;
 
 /* Non-zero means autoselect window with the mouse cursor.  */
 
-int autoselect_window_p;
+int mouse_autoselect_window;
 
 /* 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
@@ -6296,7 +6296,7 @@ note_mouse_movement (frame, msg)
   XSETFRAME (last_mouse_motion_frame, frame);
 
 #if 0 /* Calling Lisp asynchronously is not safe.  */
-  if (autoselect_window_p)
+  if (mouse_autoselect_window)
     {
       int area;
       Lisp_Object window;
@@ -11388,9 +11388,9 @@ affect on NT machines.  */);
   staticpro (&previous_help_echo);
   help_echo_pos = -1;
 
-  DEFVAR_BOOL ("autoselect-window", &autoselect_window_p,
+  DEFVAR_BOOL ("mouse-autoselect-window", &mouse_autoselect_window,
     doc: /* *Non-nil means autoselect window with mouse pointer.  */);
-  autoselect_window_p = 0;
+  mouse_autoselect_window = 0;
 
   DEFVAR_BOOL ("w32-use-visible-system-caret",
 	       &w32_use_visible_system_caret,

src/xterm.c

@@ -255,9 +255,9 @@ static int any_help_event_p;
 
 /* Non-zero means autoselect window with the mouse cursor.  */
 
-int autoselect_window_p;
+int mouse_autoselect_window;
 
-/* Last window where we saw the mouse.  Used by autoselect-window.  */
+/* Last window where we saw the mouse.  Used by mouse-autoselect-window.  */
 static Lisp_Object last_window;
 
 /* Non-zero means draw block and hollow cursor as wide as the glyph
@@ -10878,7 +10878,7 @@ XTread_socket (sd, bufp, numchars, expected)
 		  {
 
 		    /* Generate SELECT_WINDOW_EVENTs when needed.  */
-		    if (autoselect_window_p)
+		    if (mouse_autoselect_window)
 		      {
 			Lisp_Object window;
 			int area;
@@ -15117,9 +15117,9 @@ syms_of_xterm ()
   staticpro (&previous_help_echo);
   help_echo_pos = -1;
 
-  DEFVAR_BOOL ("autoselect-window", &autoselect_window_p,
+  DEFVAR_BOOL ("mouse-autoselect-window", &mouse_autoselect_window,
     doc: /* *Non-nil means autoselect window with mouse pointer.  */);
-  autoselect_window_p = 0;
+  mouse_autoselect_window = 0;
 
   DEFVAR_BOOL ("x-stretch-cursor", &x_stretch_cursor_p,
     doc: /* *Non-nil means draw block cursor as wide as the glyph under it.