From: Glenn Morris <rgm@gnu.org>
Date: Thu, 3 Jan 2013 18:31:45 +0000 (-0800)
Subject: term-handle-colors-array fix
X-Git-Tag: emacs-24.2.92~39
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d2be4dccb9088cc7e27aeb6b01ef23ed20da2447;p=emacs.git

term-handle-colors-array fix

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

Fixes: debbugs:13337
---

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