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

[Eli Zaretskii]

Index: emacs/lisp/facemenu.el
diff -c emacs/lisp/facemenu.el:1.56 emacs/lisp/facemenu.el:1.57
*** emacs/lisp/facemenu.el:1.56 Wed Jan  2 17:56:04 2002
--- emacs/lisp/facemenu.el      Fri Jan 25 08:11:49 2002
***************
*** 516,529 ****
  colors to display.  Otherwise, this command computes a list
  of colors that the current display can handle."
    (interactive)
!   (when (null list)
      (setq list (defined-colors))
      ;; Delete duplicate colors.
      (let ((l list))
        (while (cdr l)
        (if (facemenu-color-equal (car l) (car (cdr l)))
            (setcdr l (cdr (cdr l)))
!         (setq l (cdr l))))))
    (with-output-to-temp-buffer "*Colors*"
      (save-excursion
        (set-buffer standard-output)
--- 516,533 ----
  colors to display.  Otherwise, this command computes a list
  of colors that the current display can handle."
    (interactive)
!   (when (and (null list) (> (display-color-cells) 0))
      (setq list (defined-colors))
      ;; Delete duplicate colors.
      (let ((l list))
        (while (cdr l)
        (if (facemenu-color-equal (car l) (car (cdr l)))
            (setcdr l (cdr (cdr l)))
!         (setq l (cdr l)))))
!     ;; Don't show more than what the display can handle.
!     (let ((lc (nthcdr (1- (display-color-cells)) list)))
!       (if lc
!         (setcdr lc nil))))
    (with-output-to-temp-buffer "*Colors*"
      (save-excursion
        (set-buffer standard-output)