# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1292843490 -28800
# Node ID b476e8175f20784abe2f79a5a5f23375064dcd21
# Parent  fd105bd6a7675a1e00ba396ded7ab1d2340b5372
* src/frame.c (focus_follows_mouse): Default to 0 (Bug#7269).

diff -r fd105bd6a767 -r b476e8175f20 etc/NEWS
--- a/etc/NEWS	Mon Dec 20 11:18:56 2010 +0800
+++ b/etc/NEWS	Mon Dec 20 19:11:30 2010 +0800
@@ -222,6 +222,8 @@
 ** 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.
+
 
 * Editing Changes in Emacs 24.1
 
diff -r fd105bd6a767 -r b476e8175f20 src/ChangeLog
--- a/src/ChangeLog	Mon Dec 20 11:18:56 2010 +0800
+++ b/src/ChangeLog	Mon Dec 20 19:11:30 2010 +0800
@@ -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 -r fd105bd6a767 -r b476e8175f20 src/frame.c
--- a/src/frame.c	Mon Dec 20 11:18:56 2010 +0800
+++ b/src/frame.c	Mon Dec 20 19:11:30 2010 +0800
@@ -4602,15 +4602,7 @@
 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);