Commit 847f5dab authored by Jim Blandy's avatar Jim Blandy
Browse files

* x-win.el (x-defined-colors): Use x-color-defined-p instead of

	(x-handle-geometry): Use x-parse-geometry instead of x-geometry.
parent c8c72d6b
......@@ -147,8 +147,9 @@
;; Handle the geometry option
(defun x-handle-geometry (switch)
(setq initial-frame-alist (append initial-frame-alist
(x-geometry (car x-invocation-args)))
(setq initial-frame-alist
(append initial-frame-alist
(x-parse-geometry (car x-invocation-args)))
x-invocation-args (cdr x-invocation-args)))
(defvar x-display-name nil
......@@ -418,7 +419,7 @@ This returns ARGS with the arguments that have been processed removed."
(while all-colors
(setq this-color (car all-colors)
all-colors (cdr all-colors))
(and (x-defined-color this-color)
(and (x-color-defined-p this-color)
(setq defined-colors (cons this-color defined-colors))))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment