From: John Wiegley <johnw@newartisans.com>
Date: Sun, 6 Mar 2016 20:51:44 +0000 (-0800)
Subject: Revert "Use colors in the VC mode lines"
X-Git-Tag: emacs-26.0.90~2361
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7882dc625e1ec562fcd0e1b743ef11b160cae18e;p=emacs.git

Revert "Use colors in the VC mode lines"

This reverts commit 2621c293d82c15c00d9e73a8db75d70da7d0a23b.
---

diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 6488e53ef02..0c1718e94cb 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -54,51 +54,44 @@
   :group 'vc-faces)
 
 (defface vc-needs-update-state
-  '((default :inherit vc-state-base-face)
-    (((class color)) :foreground "blue" :weight bold))
+  '((default :inherit vc-state-base-face))
   "Face for VC modeline state when the file needs update."
   :version "25.1"
   :group 'vc-faces)
 
 (defface vc-locked-state
-  '((default :inherit vc-state-base-face)
-    (((class color)) :foreground "red"))
+  '((default :inherit vc-state-base-face))
   "Face for VC modeline state when the file locked."
   :version "25.1"
   :group 'vc-faces)
 
 (defface vc-locally-added-state
-  '((default :inherit vc-state-base-face)
-    (((class color)) :foreground "ForestGreen"))
+  '((default :inherit vc-state-base-face))
   "Face for VC modeline state when the file is locally added."
   :version "25.1"
   :group 'vc-faces)
 
 (defface vc-conflict-state
-  '((default :inherit vc-state-base-face)
-    (((class color)) :foreground "red" :weight bold))
+  '((default :inherit vc-state-base-face))
   "Face for VC modeline state when the file contains merge conflicts."
   :version "25.1"
   :group 'vc-faces)
 
 (defface vc-removed-state
-  '((default :inherit vc-state-base-face)
-    (((class color)) :foreground "red"))
+  '((default :inherit vc-state-base-face))
   "Face for VC modeline state when the file was removed from the VC system."
   :version "25.1"
   :group 'vc-faces)
 
 (defface vc-missing-state
-  '((default :inherit vc-state-base-face)
-    (((class color)) :foreground "red"))
+  '((default :inherit vc-state-base-face))
   "Face for VC modeline state when the file is missing from the file system."
   :version "25.1"
   :group 'vc-faces)
 
 (defface vc-edited-state
-  '((default :inherit vc-state-base-face)
-    (((class color)) :foreground "ForestGreen"))
-  "Face for VC modeline state when the file is edited."
+  '((default :inherit vc-state-base-face))
+  "Face for VC modeline state when the file is up to date."
   :version "25.1"
   :group 'vc-faces)