From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 20 Dec 2010 11:11:30 +0000 (+0800)
Subject: * src/frame.c (focus_follows_mouse): Default to 0 (Bug#7269).
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~278^2~80
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f13183cf1970a94ec220000b0d0f20868df6edbc;p=emacs.git

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

diff --git a/etc/NEWS b/etc/NEWS
index 89d6139dc0e..f7288de8b13 100644
--- 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.
+
 
 * Editing Changes in Emacs 24.1
 
diff --git a/src/ChangeLog b/src/ChangeLog
index a6ee107422c..3dabc0703ac 100644
--- 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 6cf46f1a0ba..00a65d630da 100644
--- 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);