diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/faces.el | 10 |
2 files changed, 15 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3f74bb92e86..8eea6d16c36 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +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'. diff --git a/lisp/faces.el b/lisp/faces.el index 7a5881fb511..0d49650a509 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -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 |