Mercurial > emacs
changeset 12169:67f9dfb23d7c
(x-create-frame-with-faces): Don't use initial-frame-alist
when looking for the X resource name.
Copy parameters from default-frame-alist, before the geometry
specs from the X resource database.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Fri, 09 Jun 1995 15:42:08 +0000 |
| parents | 40be3e73cfb0 |
| children | 2bc3141d0d19 |
| files | lisp/faces.el |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/faces.el Fri Jun 09 15:24:50 1995 +0000 +++ b/lisp/faces.el Fri Jun 09 15:42:08 1995 +0000 @@ -941,8 +941,7 @@ ;; Read this frame's geometry resource, if it has an explicit name, ;; and put the specs into PARAMETERS. (let* ((name (or (cdr (assq 'name parameters)) - (cdr (assq 'name default-frame-alist)) - (cdr (assq 'name initial-frame-alist)))) + (cdr (assq 'name default-frame-alist)))) (x-resource-name name) (res-geometry (if name (x-get-resource "geometry" "Geometry"))) parsed) @@ -954,8 +953,11 @@ (if (or (assq 'top parsed) (assq 'left parsed)) (setq parsed (cons '(user-position . t) (cons '(user-size . t) parsed)))) - ;; All geometry parms apply to the initial frame. - (setq parameters (append parameters parsed))))) + ;; Put the geometry parameters at the end. + ;; Copy default-frame-alist so that they go after it. + (setq parameters (append parameters + default-frame-alist + parsed))))) (if (null global-face-data) (x-create-frame parameters) (let* ((visibility-spec (assq 'visibility parameters))