Commit 1e221c16 authored by Miles Bader's avatar Miles Bader
Browse files

(color-values, color-defined-p): Use `member', not

`memq', because it works correctly for strings.
(frame-set-background-mode): Actually, "unspecified-fg" and
"unspecified-bg" *are* strings.  Use `member', not `memq', and
`equal', not `eq', when a string value is possible.
parent b6ef4898
2000-10-22 Miles Bader <miles@gnu.org>
* faces.el (color-values, color-defined-p): Use `member', not
`memq', because it works correctly for strings.
(frame-set-background-mode): Actually, "unspecified-fg" and
"unspecified-bg" *are* strings. Use `member', not `memq', and
`equal', not `eq', when a string value is possible.
2000-10-21 Eli Zaretskii <eliz@is.elta.co.il>
* info.el (Info-file-list-for-emacs): Add an entry for Speedbar.
......@@ -35,6 +43,8 @@
* window.el (fit-window-to-buffer): New function.
(shrink-window-if-larger-than-buffer): Use it.
(window-text-height): Don't expect minibuffers to have mode-lines.
* help.el (resize-temp-buffer-window): Use `fit-window-to-buffer'.
* international/quail.el (quail-update-guidance): Use
`fit-window-to-buffer' instead of `set-window-text-height'.
......
......@@ -1241,9 +1241,9 @@ If FRAME doesn't support colors, the value is nil."
If FRAME is omitted or nil, use the selected frame.
If COLOR is the symbol `unspecified' or one of the strings
\"unspecified-fg\" or \"unspecified-bg\", the value is nil."
(if (memq color '(unspecified "unspecified-bg" "unspecified-fg"))
(if (member color '(unspecified "unspecified-bg" "unspecified-fg"))
nil
(if (memq (framep (or frame (selected-frame))) '(x w32))
(if (member (framep (or frame (selected-frame))) '(x w32))
(xw-color-defined-p color frame)
(numberp (tty-color-translate color frame)))))
(defalias 'x-color-defined-p 'color-defined-p)
......@@ -1256,7 +1256,7 @@ If FRAME is omitted or nil, use the selected frame.
If FRAME cannot display COLOR, the value is nil.
If COLOR is the symbol `unspecified' or one of the strings
\"unspecified-fg\" or \"unspecified-bg\", the value is nil."
(if (memq color '(unspecified "unspecified-fg" "unspecified-bg"))
(if (member color '(unspecified "unspecified-fg" "unspecified-bg"))
nil
(if (memq (framep (or frame (selected-frame))) '(x w32))
(xw-color-values color frame)
......@@ -1320,9 +1320,9 @@ according to the `background-mode' and `display-type' frame parameters."
'dark)
;; Unspecified frame background color can only happen
;; on tty's.
((memq bg-color '(unspecified unspecified-bg))
((member bg-color '(unspecified "unspecified-bg"))
'dark)
((eq bg-color 'unspecified-fg) ; inverted colors
((equal bg-color "unspecified-fg") ; inverted colors
'light)
((>= (apply '+ (x-color-values bg-color frame))
;; Just looking at the screen, colors whose
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment