Mercurial > emacs

changeset 28182:cf4e7d561883

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(other-frame): Call x-focus-frame only if focus-follows-mouse is off.
author Gerd Moellmann <gerd@gnu.org>
date Fri, 17 Mar 2000 20:54:41 +0000
parents 20032164c359
children 7d97c6fbc3d9
files lisp/frame.el
diffstat 1 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/frame.el	Fri Mar 17 20:05:14 2000 +0000
+++ b/lisp/frame.el	Fri Mar 17 20:54:41 2000 +0000
@@ -577,13 +577,14 @@
     (select-frame frame)
     (raise-frame frame)
     ;; Ensure, if possible, that frame gets input focus.
-    (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))))
+    (when (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))))))
 
 (defun make-frame-names-alist ()
   (let* ((current-frame (selected-frame))