# HG changeset patch
# User Jim Blandy <jimb@redhat.com>
# Date 733034389 0
# Node ID df7de9403e02d8bcde511c52a50a16711b962c99
# Parent  ed9b74c46fb9e6afdb4f409dd39dbcc81847a393
	* x-win.el (x-defined-colors): Use x-color-defined-p instead of
	x-defined-color.
	(x-handle-geometry): Use x-parse-geometry instead of x-geometry.

diff -r ed9b74c46fb9 -r df7de9403e02 lisp/term/x-win.el
--- a/lisp/term/x-win.el	Thu Mar 25 04:37:38 1993 +0000
+++ b/lisp/term/x-win.el	Thu Mar 25 04:39:49 1993 +0000
@@ -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 @@
     (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))))
     defined-colors))