Mercurial > emacs
changeset 22539:45ccce07729d
(internal-face-interactive): Handle case where BOOL is `color'.
| author | Andrew Innes <andrewi@gnu.org> |
|---|---|
| date | Mon, 22 Jun 1998 17:21:56 +0000 |
| parents | 2649d061d370 |
| children | 0e7c65caf1cb |
| files | lisp/term/w32-win.el |
| diffstat | 1 files changed, 17 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/term/w32-win.el Mon Jun 22 02:10:41 1998 +0000 +++ b/lisp/term/w32-win.el Mon Jun 22 17:21:56 1998 +0000 @@ -680,15 +680,23 @@ (or (funcall fn face (selected-frame)) (funcall fn 'default (selected-frame))))) (fn-win (intern (concat (symbol-name window-system) "-select-" what))) - (value - (if (fboundp fn-win) - (funcall fn-win) - (if bool - (y-or-n-p (concat "Should face " (symbol-name face) - " be " bool "? ")) - (read-string (concat prompt " " (symbol-name face) " to: ") - default))))) - (list face (if (equal value "") nil value)))) + value) + (setq value + (cond ((fboundp fn-win) + (funcall fn-win)) + ((eq bool 'color) + (completing-read (concat prompt " " (symbol-name face) " to: ") + (mapcar (function (lambda (color) + (cons color color))) + x-colors) + nil nil nil nil default)) + (bool + (y-or-n-p (concat "Should face " (symbol-name face) + " be " bool "? "))) + (t + (read-string (concat prompt " " (symbol-name face) " to: ") + nil nil default)))) + (list face (if (equal value "") nil value)))) ;; Redefine the font selection to use the standard W32 dialog