# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1030157967 0
# Node ID 876e9026e464f53613380bad1aa62f4ea817fcec
# Parent  7faae7c35e0747866f92dd76b05b1900b40c79d6
(select-frame-by-name, select-frame-set-input-focus):
Always call x-focus-frame, if using x.
Use set-mouse-position on all systems, if focus-follows-mouse.

diff -r 7faae7c35e07 -r 876e9026e464 lisp/frame.el
--- a/lisp/frame.el	Sat Aug 24 02:58:53 2002 +0000
+++ b/lisp/frame.el	Sat Aug 24 02:59:27 2002 +0000
@@ -654,14 +654,12 @@
     (select-frame frame)
     (raise-frame frame)
     ;; Ensure, if possible, that frame gets input focus.
-    (when (eq window-system 'w32)
-      (w32-focus-frame frame))
+    (cond ((eq window-system 'x)
+	   (x-focus-frame frame))
+	  ((eq window-system 'w32)
+	   (w32-focus-frame frame)))
     (cond (focus-follows-mouse
-	   (unless (eq window-system 'w32)
-	     (set-mouse-position (selected-frame) (1- (frame-width)) 0)))
-	  (t
-	   (when (eq window-system 'x)
-	     (x-focus-frame frame)))))
+	   (set-mouse-position (selected-frame) (1- (frame-width)) 0))))
 
 (defun other-frame (arg)
   "Select the ARG'th different visible frame on current display, and raise it.
@@ -721,10 +719,12 @@
     (raise-frame frame)
     (select-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 focus-follows-mouse
+      (set-mouse-position frame (1- (frame-width frame)) 0))))
 
 ;;;; Frame configurations