aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2007-10-12 06:29:24 +0000
committerMartin Rudalics2007-10-12 06:29:24 +0000
commitd6c19bb35a2242b1eb0cef45a5a36d9ad52c5b23 (patch)
tree9113d957a708b95fbf5c486bc8a895589e681a2c
parent61bbdbc6f67fa0cc23a194af7aa2ab2cda63af76 (diff)
downloademacs-d6c19bb35a2242b1eb0cef45a5a36d9ad52c5b23.tar.gz
emacs-d6c19bb35a2242b1eb0cef45a5a36d9ad52c5b23.zip
(handle-select-window): Revert part of 2007-10-06
change setting the input focus.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/window.el4
2 files changed, 5 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1cfef0ed731..9fd351ce200 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-10-12 Martin Rudalics <rudalics@gmx.at>
2
3 * window.el (handle-select-window): Revert part of 2007-10-06
4 change setting the input focus.
5
12007-10-12 Glenn Morris <rgm@gnu.org> 62007-10-12 Glenn Morris <rgm@gnu.org>
2 7
3 * cus-edit.el (custom-variable-menu, custom-face-menu) 8 * cus-edit.el (custom-variable-menu, custom-face-menu)
diff --git a/lisp/window.el b/lisp/window.el
index dd402750de4..0626625ec86 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -925,10 +925,6 @@ active. This function is run by `mouse-autoselect-window-timer'."
925 (when mouse-autoselect-window 925 (when mouse-autoselect-window
926 ;; Reset state of delayed autoselection. 926 ;; Reset state of delayed autoselection.
927 (setq mouse-autoselect-window-state nil) 927 (setq mouse-autoselect-window-state nil)
928 ;; Set input focus to handle cross-frame movement. Bind
929 ;; `focus-follows-mouse' to avoid moving the mouse cursor.
930 (let (focus-follows-mouse)
931 (select-frame-set-input-focus (window-frame window)))
932 ;; Run `mouse-leave-buffer-hook' when autoselecting window. 928 ;; Run `mouse-leave-buffer-hook' when autoselecting window.
933 (run-hooks 'mouse-leave-buffer-hook)) 929 (run-hooks 'mouse-leave-buffer-hook))
934 (select-window window)))) 930 (select-window window))))