Mercurial > emacs

diff lisp/frame.el @ 91849:6c35c4ccf09e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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 5d58981e6690
children 072ae82c3f6a
line wrap: on
line diff
--- 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