diff options
Diffstat (limited to 'lisp/frame.el')
| -rw-r--r-- | lisp/frame.el | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index 37673835f34..1c11829475b 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -820,10 +820,10 @@ the user during startup." (select-frame frame) (raise-frame frame) ;; Ensure, if possible, that frame gets input focus. - (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)))) + (when (memq (window-system frame) '(x mac w32)) + (x-focus-frame frame)) + (when focus-follows-mouse + (set-mouse-position (selected-frame) (1- (frame-width)) 0))) (defun other-frame (arg) "Select the ARGth different visible frame on current display, and raise it. @@ -950,8 +950,15 @@ is given and non-nil, the unwanted frames are iconified instead." ;; Since we can't set a frame's minibuffer status, ;; we might as well omit the parameter altogether. (let* ((parms (nth 1 parameters)) - (mini (assq 'minibuffer parms))) - (if mini (setq parms (delq mini parms))) + (mini (assq 'minibuffer parms)) + (name (assq 'name parms)) + (explicit-name (cdr (assq 'explicit-name parms)))) + (when mini (setq parms (delq mini parms))) + ;; Leave name in iff it was set explicitly. + ;; This should fix the behavior reported in + ;; http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg01632.html + (when (and name (not explicit-name)) + (setq parms (delq name parms))) parms)) (set-window-configuration (nth 2 parameters))) (setq frames-to-delete (cons frame frames-to-delete))))) |