Mercurial > emacs
changeset 91849:6c35c4ccf09e
(frame-notice-user-settings): Distinguish explicit parent-id
from the auto-generated one.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 14 Feb 2008 21:16:36 +0000 |
| parents | 75f72cab9771 |
| children | d317101e8648 |
| files | lisp/ChangeLog lisp/frame.el |
| diffstat | 2 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Feb 14 19:41:43 2008 +0000 +++ b/lisp/ChangeLog Thu Feb 14 21:16:36 2008 +0000 @@ -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
--- a/lisp/frame.el Thu Feb 14 19:41:43 2008 +0000 +++ b/lisp/frame.el Thu Feb 14 21:16:36 2008 +0000 @@ -417,6 +417,9 @@ ;; 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