*** window.el.~1.120.2.2.~	Wed Aug  8 23:12:06 2007
--- window.el	Tue Sep 18 08:54:28 2007
***************
*** 921,927 ****
  	(setq mouse-autoselect-window-state nil)
  	(when mouse-autoselect-window
  	  ;; Run `mouse-leave-buffer-hook' when autoselecting window.
! 	  (run-hooks 'mouse-leave-buffer-hook))
  	(select-window window)))))
  
  (define-key ctl-x-map "2" 'split-window-vertically)
--- 921,932 ----
  	(setq mouse-autoselect-window-state nil)
  	(when mouse-autoselect-window
  	  ;; Run `mouse-leave-buffer-hook' when autoselecting window.
! 	  (run-hooks 'mouse-leave-buffer-hook)
! 	  (unless focus-follows-mouse
! 	    ;; Make sure frame is raised when autoselecting window and
! 	    ;; we assume that the window manager does not autoraise the
! 	    ;; frame of window.
! 	    (raise-frame (window-frame window))))
  	(select-window window)))))
  
  (define-key ctl-x-map "2" 'split-window-vertically)