# HG changeset patch
# User Martin Rudalics <rudalics@gmx.at>
# Date 1192178456 0
# Node ID 1a92b80c7fa223ea304761de916a431f7c86dc0f
# Parent  257d07b87d1c95cd12f98d7c7bddea45889fc6e4
(set-frame-configuration): Assign name parameter only
if it has been set explicitly before.

diff -r 257d07b87d1c -r 1a92b80c7fa2 lisp/frame.el
--- a/lisp/frame.el	Fri Oct 12 08:36:47 2007 +0000
+++ b/lisp/frame.el	Fri Oct 12 08:40:56 2007 +0000
@@ -807,8 +807,15 @@
 			;; 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))))))