Mercurial > emacs
comparison lisp/frame.el @ 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 | 5d58981e6690 |
| children | 072ae82c3f6a |
comparison
equal
deleted
inserted
replaced
| 91848:75f72cab9771 | 91849:6c35c4ccf09e |
|---|---|
| 415 (setq parms (frame-parameters frame-initial-frame)) | 415 (setq parms (frame-parameters frame-initial-frame)) |
| 416 | 416 |
| 417 ;; Get rid of `name' unless it was specified explicitly before. | 417 ;; Get rid of `name' unless it was specified explicitly before. |
| 418 (or (assq 'name frame-initial-frame-alist) | 418 (or (assq 'name frame-initial-frame-alist) |
| 419 (setq parms (delq (assq 'name parms) parms))) | 419 (setq parms (delq (assq 'name parms) parms))) |
| 420 ;; An explicit parent-id is a request to XEmbed the frame. | |
| 421 (or (assq 'parent-id frame-initial-frame-alist) | |
| 422 (setq parms (delq (assq 'parent-id parms) parms))) | |
| 420 | 423 |
| 421 (setq parms (append initial-frame-alist | 424 (setq parms (append initial-frame-alist |
| 422 window-system-frame-alist | 425 window-system-frame-alist |
| 423 default-frame-alist | 426 default-frame-alist |
| 424 parms | 427 parms |