; Merge from origin/emacs-25

[gnu-emacs] / lisp / vc / vc-hooks.el

diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 6488e53ef026ce540d7d01965a393a2c9182f709..c6512e95e491cd604c5be465c594d1512d719ec8 100644 (file)
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -54,50 +54,43 @@
   :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"))
+  '((default :inherit vc-state-base-face))
   "Face for VC modeline state when the file is edited."
   :version "25.1"
   :group 'vc-faces)