(other-frame): Call x-focus-frame.

1 files changed, 8 insertions, 5 deletions

diff --git a/lisp/frame.el b/lisp/frame.el
index d89798285f7..e3fd95a5df0 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -574,13 +574,16 @@ A negative ARG moves in the opposite order."
       (while (not (eq (frame-visible-p frame) t))
         (setq frame (previous-frame frame)))
       (setq arg (1+ arg)))
-    (raise-frame frame)
     (select-frame frame)
+    (raise-frame frame)
     ;; Ensure, if possible, that frame gets input focus.
-    (if (eq window-system 'w32)
-        (w32-focus-frame frame)
-      (when focus-follows-mouse
-        (set-mouse-position (selected-frame) (1- (frame-width)) 0)))))
+    (cond ((eq window-system 'x)
+           (x-focus-frame frame))
+          ((eq window-system 'w32)
+           (w32-focus-frame frame)))
+    (when (and (not (eq window-system 'w32))
+               focus-follows-mouse)
+      (set-mouse-position (selected-frame) (1- (frame-width)) 0))))
 
 (defun make-frame-names-alist ()
   (let* ((current-frame (selected-frame))