[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111127: term-handle-colors-array fix

[Glenn Morris]

------------------------------------------------------------
revno: 111127
fixes bug: http://debbugs.gnu.org/13337
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Thu 2013-01-03 10:31:45 -0800
message:
  term-handle-colors-array fix
  
  * lisp/term.el (term-handle-colors-array):
  Ensure face attributes are fully specified, not nil.
modified:
  lisp/ChangeLog
  lisp/term.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-03 06:33:25 +0000
+++ b/lisp/ChangeLog    2013-01-03 18:31:45 +0000
@@ -1,5 +1,8 @@
 2013-01-03  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/term.el'
--- a/lisp/term.el      2013-01-03 06:33:25 +0000
+++ b/lisp/term.el      2013-01-03 18:31:45 +0000
@@ -3216,18 +3216,24 @@
         (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