diff options
author | Jason Rumney <jasonr@gnu.org> | 2007-09-18 22:17:29 +0000 |
---|---|---|
committer | Jason Rumney <jasonr@gnu.org> | 2007-09-18 22:17:29 +0000 |
commit | 31e0520c902021cc7e79818ac2d3eeca3f131a1e (patch) | |
tree | 7092dc219eda93c8a5780006d0f0178f8c37e15e /lisp/frame.el | |
parent | 334a1195ab0712ba1254f4b396a1ac283ffd16c8 (diff) | |
download | emacs-31e0520c902021cc7e79818ac2d3eeca3f131a1e.tar.gz |
(select-frame-set-input-focus, select-frame-by-name): Use x-focus-frame for w32.
Diffstat (limited to 'lisp/frame.el')
-rw-r--r-- | lisp/frame.el | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index e9d9489fb63..40e2a041ecf 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -818,10 +818,8 @@ This variable does not have any effect on MS-Windows." (select-frame frame) (raise-frame frame) ;; Ensure, if possible, that frame gets input focus. - (cond ((memq (window-system frame) '(x max)) - (x-focus-frame frame)) - ((eq (window-system frame) 'w32) - (w32-focus-frame frame))) + (cond ((memq (window-system frame) '(x max w32)) + (x-focus-frame frame))) (cond (focus-follows-mouse (set-mouse-position (selected-frame) (1- (frame-width)) 0)))) @@ -905,10 +903,8 @@ If there is no frame by that name, signal an error." (raise-frame frame) (select-frame frame) ;; Ensure, if possible, that frame gets input focus. - (cond ((eq (window-system frame) 'x) - (x-focus-frame frame)) - ((eq (window-system frame) 'w32) - (w32-focus-frame frame))) + (cond ((memq (window-system frame) '(x w32)) + (x-focus-frame frame))) (when focus-follows-mouse (set-mouse-position frame (1- (frame-width frame)) 0)))) |