Mercurial > emacs
changeset 60522:66456f4ae924
(list-colors-print): Print #RRGGBB in default face.
Remove 1 space before #RRGGBB to not truncate it on terminal
windows w/o fringes. Remove 1 space between bg and fg examples
to get more space.
(list-colors-duplicates): Replace `and' with `if' for `boundp' to
avoid byte-compile warnings.
| author | Juri Linkov <juri@jurta.org> |
|---|---|
| date | Tue, 08 Mar 2005 21:47:03 +0000 |
| parents | f38eb69aa763 |
| children | 2fa021a3a2fb |
| files | lisp/facemenu.el |
| diffstat | 1 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/facemenu.el Tue Mar 08 21:45:00 2005 +0000 +++ b/lisp/facemenu.el Tue Mar 08 21:47:03 2005 +0000 @@ -513,17 +513,17 @@ 'face (cons 'background-color (car color))) (put-text-property (prog1 (point) - (insert " " (if (cdr color) - (mapconcat 'identity (cdr color) ", ") - (car color))) - (indent-to (max (- (window-width) 8) 44)) - (insert (apply 'format " #%02x%02x%02x" - (mapcar (lambda (c) (lsh c -8)) - (color-values (car color))))) + (insert " " (if (cdr color) + (mapconcat 'identity (cdr color) ", ") + (car color)))) + (point) + 'face (cons 'foreground-color (car color))) + (indent-to (max (- (window-width) 8) 44)) + (insert (apply 'format "#%02x%02x%02x" + (mapcar (lambda (c) (lsh c -8)) + (color-values (car color))))) - (insert "\n")) - (point) - 'face (cons 'foreground-color (car color)))) + (insert "\n")) (goto-char (point-min))) (defun list-colors-duplicates (&optional list) @@ -539,8 +539,8 @@ (l list)) (while (cdr l) (if (and (facemenu-color-equal (car (car l)) (car (car (cdr l)))) - (not (and (boundp 'w32-default-color-map) - (not (assoc (car (car l)) w32-default-color-map))))) + (not (if (boundp 'w32-default-color-map) + (not (assoc (car (car l)) w32-default-color-map))))) (progn (setcdr (car l) (cons (car (car (cdr l))) (cdr (car l)))) (setcdr l (cdr (cdr l))))