diff options
| author | Glenn Morris | 2013-01-03 10:31:45 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-01-03 10:31:45 -0800 |
| commit | d2be4dccb9088cc7e27aeb6b01ef23ed20da2447 (patch) | |
| tree | f1509091a45585a8122aafa1306ed933c7b494fc | |
| parent | c7b56654128650a9ac8e9336a0eb1c742958cc19 (diff) | |
| download | emacs-d2be4dccb9088cc7e27aeb6b01ef23ed20da2447.tar.gz emacs-d2be4dccb9088cc7e27aeb6b01ef23ed20da2447.zip | |
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 @@ | |||
| 1 | 2013-01-03 Glenn Morris <rgm@gnu.org> | 1 | 2013-01-03 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * term.el (term-handle-colors-array): Ensure face attributes | ||
| 4 | are fully specified, not nil. (Bug#13337) | ||
| 5 | |||
| 3 | * term.el (term-default-fg-color, term-default-bg-color): | 6 | * term.el (term-default-fg-color, term-default-bg-color): |
| 4 | Fix custom type. | 7 | Fix custom type. |
| 5 | 8 | ||
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'." | |||
| 3216 | (let ((color | 3216 | (let ((color |
| 3217 | (if term-ansi-current-reverse | 3217 | (if term-ansi-current-reverse |
| 3218 | (face-foreground | 3218 | (face-foreground |
| 3219 | (elt ansi-term-color-vector term-ansi-current-color)) | 3219 | (elt ansi-term-color-vector term-ansi-current-color) |
| 3220 | nil 'default) | ||
| 3220 | (face-background | 3221 | (face-background |
| 3221 | (elt ansi-term-color-vector term-ansi-current-bg-color))))) | 3222 | (elt ansi-term-color-vector term-ansi-current-bg-color) |
| 3223 | nil 'default)))) | ||
| 3222 | (setq term-current-face | 3224 | (setq term-current-face |
| 3223 | (list :background color | 3225 | (list :background color |
| 3224 | :foreground color)) | 3226 | :foreground color)) |
| 3225 | ) ;; No need to bother with anything else if it's invisible. | 3227 | ) ;; No need to bother with anything else if it's invisible. |
| 3226 | (setq term-current-face | 3228 | (setq term-current-face |
| 3227 | (list :foreground | 3229 | (list :foreground |
| 3228 | (face-foreground (elt ansi-term-color-vector term-ansi-current-color)) | 3230 | (face-foreground |
| 3231 | (elt ansi-term-color-vector term-ansi-current-color) | ||
| 3232 | nil 'default) | ||
| 3229 | :background | 3233 | :background |
| 3230 | (face-background (elt ansi-term-color-vector term-ansi-current-bg-color)) | 3234 | (face-background |
| 3235 | (elt ansi-term-color-vector term-ansi-current-bg-color) | ||
| 3236 | nil 'default) | ||
| 3231 | :inverse-video term-ansi-current-reverse)) | 3237 | :inverse-video term-ansi-current-reverse)) |
| 3232 | 3238 | ||
| 3233 | (when term-ansi-current-bold | 3239 | (when term-ansi-current-bold |