From 22ad8ea177f83eb334dd01d21f2a61cbc798dceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@toke.dk>
Date: Wed, 30 May 2018 01:41:19 +0200
Subject: [PATCH] Update magit definitions for magit 2.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
---
 solarized-definitions.el | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/solarized-definitions.el b/solarized-definitions.el
index c9f7701..66da9f2 100644
--- a/solarized-definitions.el
+++ b/solarized-definitions.el
@@ -760,14 +760,27 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
                 (guide-key/highlight-command-face (,@fg-orange))
                 (guide-key/key-face (,@fg-green))
                 ;; magit
-                (magit-log-sha1 (,@fg-red))
+                (magit-blame-heading (:inherit secondary-selection))
                 (magit-branch (,@fg-yellow))
+                (magit-branch-local (,@fg-cyan))
+                (magit-branch-remote (,@fg-green))
+                (magit-diff-added (:inherit diff-added))
+                (magit-diff-added-highlight (:inherit magit-diff-added ,@bg-base02))
+                (magit-diff-context-highlight (:inherit secondary-selection))
+                (magit-diff-hunk-heading (,@bg-base02 ,@fg-base2))
+                (magit-diff-hunk-heading-highlight (:inherit region))
+                (magit-diff-removed (:inherit diff-removed))
+                (magit-diff-removed-highlight (:inherit magit-diff-removed ,@bg-base02))
+                (magit-dimmed (,@fg-base00))
+                (magit-hash (,@fg-magenta))
+                (magit-header-line (,@fg-orange))
+                (magit-section-heading (,@fmt-bold ,@fg-yellow))
+                (magit-section-highlight (,@bg-base02))
+                (magit-signature-bad (,@fmt-bold ,@fg-red))
+                (magit-signature-good (,@fg-green))
+                (magit-signature-untrusted (,@fg-cyan))
                 (magit-tag (,@fg-green))
                 (magit-log-author (,@fg-cyan))
-                (magit-log-head-label-remote (,@fg-green))
-                (magit-log-head-label-tags (,@fg-orange))
-                (magit-log-head-label-local (,@fg-yellow))
-                (magit-log-head-label-head (,@fg-violet))
                 (magit-process-ok (,@fg-green :inherit magit-section-title))
                 (magit-process-ng (,@fg-red :inherit magit-section-title))
                 ;; undo-tree