aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Marshall1997-03-15 13:22:49 +0000
committerSimon Marshall1997-03-15 13:22:49 +0000
commit28ceec49f1ef93b03113bae54fccea3c21d779a6 (patch)
treec8425708259d45056681fc33ad4fd39259313e17
parent2d63aa6734ae5696e9a15a1ec59a2315abdd6076 (diff)
downloademacs-28ceec49f1ef93b03113bae54fccea3c21d779a6.tar.gz
emacs-28ceec49f1ef93b03113bae54fccea3c21d779a6.zip
clean code.
-rw-r--r--lisp/faces.el14
1 files changed, 5 insertions, 9 deletions
diff --git a/lisp/faces.el b/lisp/faces.el
index 4460f2b5504..26b2691e288 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1072,21 +1072,17 @@ selected frame."
1072 (let* ((name (or (cdr (assq 'name parameters)) 1072 (let* ((name (or (cdr (assq 'name parameters))
1073 (cdr (assq 'name default-frame-alist)))) 1073 (cdr (assq 'name default-frame-alist))))
1074 (x-resource-name name) 1074 (x-resource-name name)
1075 (res-geometry (if name (x-get-resource "geometry" "Geometry"))) 1075 (res-geometry (if name (x-get-resource "geometry" "Geometry"))))
1076 parsed)
1077 (if res-geometry 1076 (if res-geometry
1078 (progn 1077 (let ((parsed (x-parse-geometry res-geometry)))
1079 (setq parsed (x-parse-geometry res-geometry))
1080 ;; If the resource specifies a position, 1078 ;; If the resource specifies a position,
1081 ;; call the position and size "user-specified". 1079 ;; call the position and size "user-specified".
1082 (if (or (assq 'top parsed) (assq 'left parsed)) 1080 (if (or (assq 'top parsed) (assq 'left parsed))
1083 (setq parsed (cons '(user-position . t) 1081 (setq parsed (append '((user-position . t) (user-size . t))
1084 (cons '(user-size . t) parsed)))) 1082 parsed)))
1085 ;; Put the geometry parameters at the end. 1083 ;; Put the geometry parameters at the end.
1086 ;; Copy default-frame-alist so that they go after it. 1084 ;; Copy default-frame-alist so that they go after it.
1087 (setq parameters (append parameters 1085 (setq parameters (append parameters default-frame-alist parsed)))))
1088 default-frame-alist
1089 parsed)))))
1090 (let (frame) 1086 (let (frame)
1091 (if (null global-face-data) 1087 (if (null global-face-data)
1092 (setq frame (x-create-frame parameters)) 1088 (setq frame (x-create-frame parameters))