*** empty log message ***

4 files changed, 9 insertions, 3 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 8f60e988658..356f296e93c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -32,6 +32,10 @@ Emacs with Leim.
 
 * Changes in Emacs 21.3
 
+** New display feature: focus follows mouse.
+By setting the variable x-autoselect-window to non-nil value, mouse will
+autoselect the window it is in.  It is turned off by default.
+
 ** The new command `describe-text-at' pops up a buffer with description
 of text properties, overlays, and widgets at point, and lets you get
 more information about them, by clicking on mouse-sensitive areas or
diff --git a/etc/TODO b/etc/TODO
index 109dde2fb28..3a3203bc9f9 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -116,9 +116,6 @@
 
 * Make the Lucid menu widget display multilingual text.
 
-* Implement, in C, a ``focus follows mouse'' mode that selects a window
-  when the mouse enters it.
-
 * Check what hooks would help Emacspeak -- see the defadvising in W3.
 
 * Implement some variety of (non-gtk) drag-and-drop support under X.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 86cd8fce6e7..b0390b0a854 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2002-02-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
+        * cus-start.el (x-autoselect-window): Allow customization.
+
         * eshell/em-alias.el (eshell-alias-initialize): Do not use
         make-local-hook.
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 2fbe90fb1ad..1be67b987f6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2002-02-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
+        * xterm.c (x-autoselect-window): New variable.
+        (note_mouse_movement): Use it.
+
         * keyboard.c: Do not include "systime.h" twice.
 
 2002-02-15  Andreas Schwab  <schwab@suse.de>