term-handle-colors-array fix

* lisp/term.el (term-handle-colors-array):
Ensure face attributes are fully specified, not nil.

Fixes: debbugs:13337
This commit is contained in:
Glenn Morris 2013-01-03 10:31:45 -08:00
parent c7b5665412
commit d2be4dccb9
2 changed files with 13 additions and 4 deletions

View file

@ -1,5 +1,8 @@
2013-01-03 Glenn Morris <rgm@gnu.org>
* term.el (term-handle-colors-array): Ensure face attributes
are fully specified, not nil. (Bug#13337)
* term.el (term-default-fg-color, term-default-bg-color):
Fix custom type.

View file

@ -3216,18 +3216,24 @@ See `term-prompt-regexp'."
(let ((color
(if term-ansi-current-reverse
(face-foreground
(elt ansi-term-color-vector term-ansi-current-color))
(elt ansi-term-color-vector term-ansi-current-color)
nil 'default)
(face-background
(elt ansi-term-color-vector term-ansi-current-bg-color)))))
(elt ansi-term-color-vector term-ansi-current-bg-color)
nil 'default))))
(setq term-current-face
(list :background color
:foreground color))
) ;; No need to bother with anything else if it's invisible.
(setq term-current-face
(list :foreground
(face-foreground (elt ansi-term-color-vector term-ansi-current-color))
(face-foreground
(elt ansi-term-color-vector term-ansi-current-color)
nil 'default)
:background
(face-background (elt ansi-term-color-vector term-ansi-current-bg-color))
(face-background
(elt ansi-term-color-vector term-ansi-current-bg-color)
nil 'default)
:inverse-video term-ansi-current-reverse))
(when term-ansi-current-bold