(frame-notice-user-settings): Distinguish explicit parent-id

from the auto-generated one.

2 files changed, 8 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 11ce4304280..ce0d100fc53 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * frame.el (frame-notice-user-settings): Distinguish explicit parent-id
+        from the auto-generated one.
+
 2008-02-14  Glenn Morris  <rgm@gnu.org>
 
         * mail/rmail-spam-filter.el (rmail-spam-filter): Let-bind
diff --git a/lisp/frame.el b/lisp/frame.el
index 92b102a0878..34a46dfa634 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -417,6 +417,9 @@ there (in decreasing order of priority)."
             ;; Get rid of `name' unless it was specified explicitly before.
             (or (assq 'name frame-initial-frame-alist)
                 (setq parms (delq (assq 'name parms) parms)))
+            ;; An explicit parent-id is a request to XEmbed the frame.
+            (or (assq 'parent-id frame-initial-frame-alist)
+                (setq parms (delq (assq 'parent-id parms) parms)))
 
             (setq parms (append initial-frame-alist
                                 window-system-frame-alist