(set-frame-configuration): Assign name parameter only

if it has been set explicitly before.

2 files changed, 12 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9fd351ce200..0f166360b10 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2007-10-12  Martin Rudalics  <rudalics@gmx.at>
 
+        * frame.el (set-frame-configuration): Assign name parameter only
+        if it has been set explicitly before.
+
         * window.el (handle-select-window): Revert part of 2007-10-06
         change setting the input focus.
 
diff --git a/lisp/frame.el b/lisp/frame.el
index a169a8ec03c..cbdfa45d4f7 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -807,8 +807,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))))))