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

from the auto-generated one.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 11ce4304280d805a2ecd8c6c8e4188a7956fb1d9..ce0d100fc53c1081c1ea5c3a8c06cca77970e105 100644 (file)
--- 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 92b102a087885341f43200f213385a0747a5fe88..34a46dfa634b00a4ac61691d853bcad31fe8d1f8 100644 (file)
--- 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