[Emacs-diffs] Changes to emacs/lisp/facemenu.el

[Juri Linkov]

Index: emacs/lisp/facemenu.el
diff -c emacs/lisp/facemenu.el:1.76 emacs/lisp/facemenu.el:1.77
*** emacs/lisp/facemenu.el:1.76 Sun Mar  6 20:44:33 2005
--- emacs/lisp/facemenu.el      Tue Mar  8 21:47:03 2005
***************
*** 513,529 ****
       '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"))
       (point)
!      'face (cons 'foreground-color (car color))))
    (goto-char (point-min)))
  
  (defun list-colors-duplicates (&optional list)
--- 513,529 ----
       'face (cons 'background-color (car color)))
      (put-text-property
       (prog1 (point)
!        (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"))
    (goto-char (point-min)))
  
  (defun list-colors-duplicates (&optional list)
***************
*** 539,546 ****
         (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)))))
          (progn
            (setcdr (car l) (cons (car (car (cdr l))) (cdr (car l))))
            (setcdr l (cdr (cdr l))))
--- 539,546 ----
         (l list))
      (while (cdr l)
        (if (and (facemenu-color-equal (car (car l)) (car (car (cdr l))))
!              (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))))