diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-02-14 21:16:36 +0000 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-02-14 21:16:36 +0000 |
commit | 2f5bb432ac58bea249603f5eb89c9afaf6850cb2 (patch) | |
tree | eb5cca9be3cb8a0a54cc6bd1cf9411309c9343f5 /lisp/frame.el | |
parent | 7f5d2c72415a8de8f23c24e1a0a09ec6234a278c (diff) | |
download | emacs-2f5bb432ac58bea249603f5eb89c9afaf6850cb2.tar.gz |
(frame-notice-user-settings): Distinguish explicit parent-id
from the auto-generated one.
Diffstat (limited to 'lisp/frame.el')
-rw-r--r-- | lisp/frame.el | 3 |
1 files changed, 3 insertions, 0 deletions
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 |