From 51d23bd053b36c85874696b7a9cfa2d40877cd30 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 8 Mar 2005 21:47:03 +0000 Subject: [PATCH] (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. --- lisp/facemenu.el | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lisp/facemenu.el b/lisp/facemenu.el index a996d4c15e7..cd3998520a1 100644 --- a/lisp/facemenu.el +++ b/lisp/facemenu.el @@ -513,17 +513,17 @@ argument BUFFER-NAME is nil, it defaults to *Colors*." '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 "\n")) + (insert " " (if (cdr color) + (mapconcat 'identity (cdr color) ", ") + (car color)))) (point) - 'face (cons 'foreground-color (car color)))) + '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")) (goto-char (point-min))) (defun list-colors-duplicates (&optional list) @@ -539,8 +539,8 @@ a list of colors that the current display can handle." (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)))) -- 2.39.2