[Emacs-diffs] Changes to emacs/lisp/frame.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/02/14 21:16:41

Index: frame.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/frame.el,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -b -r1.268 -r1.269
--- frame.el    22 Jan 2008 23:53:40 -0000      1.268
+++ frame.el    14 Feb 2008 21:16:36 -0000      1.269
@@ -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