diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-01-03 10:31:45 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-01-03 10:31:45 -0800 |
| commit | d2be4dccb9088cc7e27aeb6b01ef23ed20da2447 (patch) | |
| tree | f1509091a45585a8122aafa1306ed933c7b494fc | |
| parent | c7b56654128650a9ac8e9336a0eb1c742958cc19 (diff) | |
| download | emacs-d2be4dccb9088cc7e27aeb6b01ef23ed20da2447.tar.gz | |
term-handle-colors-array fix
* lisp/term.el (term-handle-colors-array):
Ensure face attributes are fully specified, not nil.
Fixes: debbugs:13337
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/term.el | 14 |
2 files changed, 13 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d200d9733f8..90b6e683e0a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/lisp/term.el b/lisp/term.el index 8c6ac2a4adf..1a0dd0cc86f 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -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 |