[Emacs-diffs] /srv/bzr/emacs/trunk r102692: * src/frame.c (focus_follows_mouse): Default to 0 (Bug#7269).

[Chong Yidong]

------------------------------------------------------------
revno: 102692
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2010-12-20 19:11:30 +0800
message:
  * src/frame.c (focus_follows_mouse): Default to 0 (Bug#7269).
modified:
  etc/NEWS
  src/ChangeLog
  src/frame.c

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2010-12-20 00:17:26 +0000
+++ b/etc/NEWS  2010-12-20 11:11:30 +0000
@@ -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
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-12-20 00:17:26 +0000
+++ b/src/ChangeLog     2010-12-20 11:11:30 +0000
@@ -1,5 +1,9 @@
 2010-12-20  Chong Yidong  <address@hidden>
 
+       * frame.c (focus_follows_mouse): Default to 0 (Bug#7269).
+
+2010-12-20  Chong Yidong  <address@hidden>
+
        * keyboard.c (Vtool_bar_separator_image_expression): New variable.
        (parse_tool_bar_item): Use it to obtain image separators for
        displays not using native tool-bar separators.

=== modified file 'src/frame.c'
--- a/src/frame.c       2010-12-03 10:07:40 +0000
+++ b/src/frame.c       2010-12-20 11:11:30 +0000
@@ -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
+  focus_follows_mouse = 0;
 
   staticpro (&Vframe_list);