* src/frame.c (focus_follows_mouse): Default to 0 (Bug#7269).

diff --git a/etc/NEWS b/etc/NEWS
index 89d6139dc0ecbcc1c2e3dfd60f89eaff6cbab980..f7288de8b13413e99c6412687985b25c4276558e 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -222,6 +222,8 @@ the remote file-name cache is used for read access.
 ** The standalone programs lib-src/digest-doc and sorted-doc have been
 replaced with Lisp commands `doc-file-to-man' and `doc-file-to-info'.
 
+** The variable `focus-follows-mouse' now always defaults to nil.
+
 \f
 * Editing Changes in Emacs 24.1
 

diff --git a/src/ChangeLog b/src/ChangeLog
index a6ee107422c1be9b509a42a27c4846aacd2fdb78..3dabc0703ac50728919fdb6eeabad26b75732f3a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-20  Chong Yidong  <cyd@stupidchicken.com>
+
+       * frame.c (focus_follows_mouse): Default to 0 (Bug#7269).
+
 2010-12-20  Chong Yidong  <cyd@stupidchicken.com>
 
        * keyboard.c (Vtool_bar_separator_image_expression): New variable.

diff --git a/src/frame.c b/src/frame.c
index 6cf46f1a0ba4a15515f5265a06fc9086d92de8bf..00a65d630dae443c34952366a6bcb90418654495 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -4602,15 +4602,7 @@ This variable is local to the current terminal and cannot be buffer-local.  */);
 You should set this variable to tell Emacs how your window manager
 handles focus, since there is no way in general for Emacs to find out
 automatically.  See also `mouse-autoselect-window'.  */);
-#ifdef HAVE_WINDOW_SYSTEM
-#if defined(HAVE_NTGUI) || defined(HAVE_NS)
-  focus_follows_mouse = 0;
-#else
-  focus_follows_mouse = 1;
-#endif
-#else
   focus_follows_mouse = 0;
-#endif
 
   staticpro (&Vframe_list);