aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2009-11-24 02:40:03 +0000
committerGlenn Morris2009-11-24 02:40:03 +0000
commit86677b58d01a7b62bae43077c0a0f2c991b404b6 (patch)
tree800aa3cd1cddc074d88f396a0b75cad442bdc211 /src
parent65235b0a3834e833d45e72bdcddf20fd0e868938 (diff)
downloademacs-86677b58d01a7b62bae43077c0a0f2c991b404b6.tar.gz
emacs-86677b58d01a7b62bae43077c0a0f2c991b404b6.zip
(focus-follows-mouse): Mention mouse-autoselect-window.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/frame.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f59e8762779..09158373226 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12009-11-24 Glenn Morris <rgm@gnu.org>
2
3 * frame.c (focus-follows-mouse): Mention mouse-autoselect-window.
4
12009-11-23 Jan Djärv <jan.h.d@swipnet.se> 52009-11-23 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * Makefile.in: Must create deps for ecrt0.o in its rule. 7 * Makefile.in: Must create deps for ecrt0.o in its rule.
diff --git a/src/frame.c b/src/frame.c
index 2a72e43cd40..4a9d30dd215 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4642,7 +4642,7 @@ This variable is local to the current terminal and cannot be buffer-local. */);
4642 doc: /* Non-nil if window system changes focus when you move the mouse. 4642 doc: /* Non-nil if window system changes focus when you move the mouse.
4643You should set this variable to tell Emacs how your window manager 4643You should set this variable to tell Emacs how your window manager
4644handles focus, since there is no way in general for Emacs to find out 4644handles focus, since there is no way in general for Emacs to find out
4645automatically. */); 4645automatically. See also `mouse-autoselect-window'. */);
4646#ifdef HAVE_WINDOW_SYSTEM 4646#ifdef HAVE_WINDOW_SYSTEM
4647#if defined(HAVE_NTGUI) || defined(HAVE_NS) 4647#if defined(HAVE_NTGUI) || defined(HAVE_NS)
4648 focus_follows_mouse = 0; 4648 focus_follows_mouse = 0;