Mercurial > emacs
comparison lisp/term/x-win.el @ 2367:df7de9403e02
* 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.
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Thu, 25 Mar 1993 04:39:49 +0000 |
| parents | ed9b74c46fb9 |
| children | c8ae06bda9fa |
comparison
equal
deleted
inserted
replaced
| 2366:ed9b74c46fb9 | 2367:df7de9403e02 |
|---|---|
| 145 x-invocation-args | 145 x-invocation-args |
| 146 (cdr x-invocation-args))))) | 146 (cdr x-invocation-args))))) |
| 147 | 147 |
| 148 ;; Handle the geometry option | 148 ;; Handle the geometry option |
| 149 (defun x-handle-geometry (switch) | 149 (defun x-handle-geometry (switch) |
| 150 (setq initial-frame-alist (append initial-frame-alist | 150 (setq initial-frame-alist |
| 151 (x-geometry (car x-invocation-args))) | 151 (append initial-frame-alist |
| 152 (x-parse-geometry (car x-invocation-args))) | |
| 152 x-invocation-args (cdr x-invocation-args))) | 153 x-invocation-args (cdr x-invocation-args))) |
| 153 | 154 |
| 154 (defvar x-display-name nil | 155 (defvar x-display-name nil |
| 155 "The X display name specifying server and X frame.") | 156 "The X display name specifying server and X frame.") |
| 156 | 157 |
| 416 (this-color nil) | 417 (this-color nil) |
| 417 (defined-colors nil)) | 418 (defined-colors nil)) |
| 418 (while all-colors | 419 (while all-colors |
| 419 (setq this-color (car all-colors) | 420 (setq this-color (car all-colors) |
| 420 all-colors (cdr all-colors)) | 421 all-colors (cdr all-colors)) |
| 421 (and (x-defined-color this-color) | 422 (and (x-color-defined-p this-color) |
| 422 (setq defined-colors (cons this-color defined-colors)))) | 423 (setq defined-colors (cons this-color defined-colors)))) |
| 423 defined-colors)) | 424 defined-colors)) |
| 424 | 425 |
| 425 ;;;; Function keys | 426 ;;;; Function keys |
| 426 | 427 |