]> code.delx.au - gnu-emacs/commitdiff
term-handle-colors-array fix
authorGlenn Morris <rgm@gnu.org>
Thu, 3 Jan 2013 18:31:45 +0000 (10:31 -0800)
committerGlenn Morris <rgm@gnu.org>
Thu, 3 Jan 2013 18:31:45 +0000 (10:31 -0800)
* lisp/term.el (term-handle-colors-array):
Ensure face attributes are fully specified, not nil.

Fixes: debbugs:13337
lisp/ChangeLog
lisp/term.el

index d200d9733f8e646b1cea6675e78889fccda5cb2e..90b6e683e0a0dcf4e45e23ea6401d6be6cfcfeda 100644 (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.
 
index 8c6ac2a4adf93e846d39bd0238c581896a3d54a7..1a0dd0cc86f491c5b0b8a4b60360f57974c1a03b 100644 (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