# HG changeset patch # User Simon Marshall # Date 858432169 0 # Node ID 97232f50447f2b361d93b1c97489800420994198 # Parent a2d3b455c6f4267b5c5f099f3ad502c11a5f28dd clean code. diff -r a2d3b455c6f4 -r 97232f50447f lisp/faces.el --- a/lisp/faces.el Sat Mar 15 13:19:12 1997 +0000 +++ b/lisp/faces.el Sat Mar 15 13:22:49 1997 +0000 @@ -1072,21 +1072,17 @@ (let* ((name (or (cdr (assq 'name parameters)) (cdr (assq 'name default-frame-alist)))) (x-resource-name name) - (res-geometry (if name (x-get-resource "geometry" "Geometry"))) - parsed) + (res-geometry (if name (x-get-resource "geometry" "Geometry")))) (if res-geometry - (progn - (setq parsed (x-parse-geometry res-geometry)) + (let ((parsed (x-parse-geometry res-geometry))) ;; If the resource specifies a position, ;; call the position and size "user-specified". (if (or (assq 'top parsed) (assq 'left parsed)) - (setq parsed (cons '(user-position . t) - (cons '(user-size . t) parsed)))) + (setq parsed (append '((user-position . t) (user-size . t)) + 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))))) + (setq parameters (append parameters default-frame-alist parsed))))) (let (frame) (if (null global-face-data) (setq frame (x-create-frame parameters))