(command-line): Use `custom-reevaluate-setting' for

`focus-follows-mouse'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 70e50db97333bf6f1f3e3fcf2c8eae2e465aa6d4..ae7325d6a92767976a7055de24fad0c065ba5242 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-23  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * frame.el (focus-follows-mouse): Set default to nil on Mac.
+
+       * startup.el (command-line): Use `custom-reevaluate-setting' for
+       `focus-follows-mouse'.
+
 2006-09-22  Richard Stallman  <rms@gnu.org>
 
        * cus-edit.el (custom-buffer-create-internal): In `emacs -q',

diff --git a/lisp/startup.el b/lisp/startup.el
index 8ac1cef5237e85b6c39eecdc7eb81269b923dd49..3db972c3d23821d8d7dd6cf7815c730e117034b0 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -779,6 +779,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
   (custom-reevaluate-setting 'mouse-wheel-up-event)
   (custom-reevaluate-setting 'file-name-shadow-mode)
   (custom-reevaluate-setting 'send-mail-function)
+  (custom-reevaluate-setting 'focus-follows-mouse)
 
   ;; Register default TTY colors for the case the terminal hasn't a
   ;; terminal init file.