aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2007-10-12 06:23:43 +0000
committerMartin Rudalics2007-10-12 06:23:43 +0000
commitaf84194a20f63b9ac08f35fd02d6d8a41f883729 (patch)
tree87aee877e482eec590e31b3f5f57b02dafbef686
parent1663d0b8f8ec5ba33ea9b04664a40343674cf9fa (diff)
downloademacs-af84194a20f63b9ac08f35fd02d6d8a41f883729.tar.gz
emacs-af84194a20f63b9ac08f35fd02d6d8a41f883729.zip
(handle-select-window): Revert part of 2007-10-08
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 2fed711f6d7..8c07699c823 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-08
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 * emacs-lisp/byte-opt.el (top level): 8 * emacs-lisp/byte-opt.el (top level):
diff --git a/lisp/window.el b/lisp/window.el
index 41aa5aea06b..0f6ae8ab763 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1019,10 +1019,6 @@ active. This function is run by `mouse-autoselect-window-timer'."
1019 (when mouse-autoselect-window 1019 (when mouse-autoselect-window
1020 ;; Reset state of delayed autoselection. 1020 ;; Reset state of delayed autoselection.
1021 (setq mouse-autoselect-window-state nil) 1021 (setq mouse-autoselect-window-state nil)
1022 ;; Set input focus to handle cross-frame movement. Bind
1023 ;; `focus-follows-mouse' to avoid moving the mouse cursor.
1024 (let (focus-follows-mouse)
1025 (select-frame-set-input-focus (window-frame window)))
1026 ;; Run `mouse-leave-buffer-hook' when autoselecting window. 1022 ;; Run `mouse-leave-buffer-hook' when autoselecting window.
1027 (run-hooks 'mouse-leave-buffer-hook)) 1023 (run-hooks 'mouse-leave-buffer-hook))
1028 (select-window window)))) 1024 (select-window window))))