(ps-mule-begin-job): Redo this change "if

[gnu-emacs] / lisp / frame.el

diff --git a/lisp/frame.el b/lisp/frame.el
index 4c392a5895cc74d35ae692a5f5bbb46126592247..d4947f4351bf9f4e1769320dc3b1bb3f4379e342 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -565,7 +565,12 @@ If there is no frame by that name, signal an error."
        (error "There is no frame named `%s'" name))
     (make-frame-visible frame)
     (raise-frame frame)
-    (select-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)))))
 \f
 ;;;; Frame configurations
 
@@ -626,7 +631,7 @@ is given and non-nil, the unwanted frames are iconified instead."
 
 (defun frame-parameter (frame parameter)
   "Return FRAME's value for parameter PARAMETER.
-If FRAME is omitted, describe the currently selected frame."
+If FRAME is nil, describe the currently selected frame."
   (cdr (assq parameter (frame-parameters frame))))
 
 (defun frame-height (&optional frame)