diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-01-04 11:22:37 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-01-04 11:22:37 -0800 |
| commit | 0f668a4db4a33f98f84613513af3efea521b4847 (patch) | |
| tree | ab85f709ca11c2390dddfc1756656293d6762e55 /lisp/term.el | |
| parent | 4a1b123d1517bcad22f936df9c39b61fbc3e5359 (diff) | |
| parent | 92d596112248baecbe6789d450d8e8ea405de19b (diff) | |
| download | emacs-0f668a4db4a33f98f84613513af3efea521b4847.tar.gz | |
Merge from emacs-24; up to 2012-12-06T20:16:38Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/term.el')
| -rw-r--r-- | lisp/term.el | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/lisp/term.el b/lisp/term.el index fc7ec3ad0f9..b37e71280da 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -778,14 +778,14 @@ Buffer local variable.") (defcustom term-default-fg-color nil "If non-nil, default color for foreground in Term mode." :group 'term - :type 'string) + :type '(choice (const nil) (string :tag "color"))) (make-obsolete-variable 'term-default-fg-color "use the face `term' instead." "24.3") (defcustom term-default-bg-color nil "If non-nil, default color for foreground in Term mode." :group 'term - :type 'string) + :type '(choice (const nil) (string :tag "color"))) (make-obsolete-variable 'term-default-bg-color "use the face `term' instead." "24.3") @@ -3222,18 +3222,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 |