[Emacs-diffs] Changes to emacs/lisp/term.el,v

[Vinicius Jose Latorre]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Vinicius Jose Latorre <viniciusjl>      07/08/05 14:08:50

Index: term.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/term.el,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- term.el     3 Aug 2007 10:49:56 -0000       1.91
+++ term.el     5 Aug 2007 14:08:50 -0000       1.92
@@ -695,12 +695,12 @@
 
 ;;; faces -mm
 
-(defcustom term-default-fg-color 'unspecified
+(defcustom term-default-fg-color (face-foreground term-current-face)
   "Default color for foreground in `term'."
   :group 'term
   :type 'string)
 
-(defcustom term-default-bg-color 'unspecified
+(defcustom term-default-bg-color (face-background term-current-face)
   "Default color for background in `term'."
   :group 'term
   :type 'string)
@@ -1098,6 +1098,8 @@
   (make-local-variable 'term-pending-delete-marker)
   (setq term-pending-delete-marker (make-marker))
   (make-local-variable 'term-current-face)
+  (setq term-current-face (list :background term-default-bg-color
+                               :foreground term-default-fg-color))
   (make-local-variable 'term-pending-frame)
   (setq term-pending-frame nil)
   ;; Cua-mode's keybindings interfere with the term keybindings, disable it.
@@ -3055,7 +3057,8 @@
   (setq term-scroll-start 0)
   (setq term-scroll-end term-height)
   (setq term-insert-mode nil)
-  (setq term-current-face nil)
+  (setq term-current-face (list :background term-default-bg-color
+                               :foreground term-default-fg-color))
   (setq term-ansi-current-underline nil)
   (setq term-ansi-current-bold nil)
   (setq term-ansi-current-reverse nil)
@@ -3117,7 +3120,8 @@
 
 ;;; 0 (Reset) or unknown (reset anyway)
    (t
-    (setq term-current-face nil)
+    (setq term-current-face (list :background term-default-bg-color
+                                 :foreground term-default-fg-color))
     (setq term-ansi-current-underline nil)
     (setq term-ansi-current-bold nil)
     (setq term-ansi-current-reverse nil)
@@ -3154,11 +3158,11 @@
            (setq term-current-face
                  (list :background
                        (if (= term-ansi-current-color 0)
-                           (face-foreground 'default)
+                           term-default-fg-color
                          (elt ansi-term-color-vector term-ansi-current-color))
                        :foreground
                        (if (= term-ansi-current-bg-color 0)
-                           (face-background 'default)
+                           term-default-bg-color
                          (elt ansi-term-color-vector 
term-ansi-current-bg-color))))
            (when term-ansi-current-bold
              (setq term-current-face
@@ -3181,9 +3185,13 @@
                  )
          (setq term-current-face
                (list :foreground
-                     (elt ansi-term-color-vector term-ansi-current-color)
+                     (if (= term-ansi-current-color 0)
+                         term-default-fg-color
+                       (elt ansi-term-color-vector term-ansi-current-color))
                      :background
-                     (elt ansi-term-color-vector term-ansi-current-bg-color)))
+                     (if (= term-ansi-current-bg-color 0)
+                         term-default-bg-color
+                       (elt ansi-term-color-vector 
term-ansi-current-bg-color))))
          (when term-ansi-current-bold
            (setq term-current-face
                  (append '(:weight bold) term-current-face)))