From: Stefan Monnier Date: Thu, 14 Feb 2008 21:16:36 +0000 (+0000) Subject: (frame-notice-user-settings): Distinguish explicit parent-id X-Git-Tag: emacs-pretest-23.0.90~7942 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2f5bb432ac58bea249603f5eb89c9afaf6850cb2;p=emacs.git (frame-notice-user-settings): Distinguish explicit parent-id from the auto-generated one. --- 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 + + * frame.el (frame-notice-user-settings): Distinguish explicit parent-id + from the auto-generated one. + 2008-02-14 Glenn Morris * 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