comparison lisp/faces.el @ 5474:4dee0387b9de

Merged with trunk.
author Mats Lidell <matsl@xemacs.org>
date Tue, 29 Mar 2011 00:02:47 +0200
parents ac37a5f7e5be 4f0a1f4cc111
children d12a0c55b174
comparison
equal deleted inserted replaced
5473:ac37a5f7e5be 5474:4dee0387b9de
1698 t 1698 t
1699 (let* ((props (get-custom-frame-properties frame)) 1699 (let* ((props (get-custom-frame-properties frame))
1700 (type (plist-get props 'type)) 1700 (type (plist-get props 'type))
1701 (class (plist-get props 'class)) 1701 (class (plist-get props 'class))
1702 (background (plist-get props 'background)) 1702 (background (plist-get props 'background))
1703 (min-colors (plist-get props 'min-colors))
1704 (match t) 1703 (match t)
1705 (entries display) 1704 (entries display)
1706 entry req options) 1705 entry req options)
1707 (while (and entries match) 1706 (while (and entries match)
1708 (setq entry (car entries) 1707 (setq entry (car entries)
1711 options (cdr entry) 1710 options (cdr entry)
1712 match (case req 1711 match (case req
1713 (type (memq type options)) 1712 (type (memq type options))
1714 (class (memq class options)) 1713 (class (memq class options))
1715 (background (memq background options)) 1714 (background (memq background options))
1716 (min-colors (>= (display-color-cells frame) 1715 ;; `display-color-cells' can return nil (eg, TTYs).
1716 ;; If so, assume monochrome.
1717 (min-colors (>= (or (display-color-cells frame) 2)
1717 (car options))) 1718 (car options)))
1718 (t (warn "Unknown req `%S' with options `%S'" 1719 (t (warn "Unknown req `%S' with options `%S'"
1719 req options) 1720 req options)
1720 nil)))) 1721 nil))))
1721 match))) 1722 match)))