commit 786f9f361e1438c9d288ea091bbd14d9c04e06a3
parent 76e46d866f93ef059f68998cfd97100b1b6c051d
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Wed, 20 Nov 2019 15:31:43 +0100
magit: Remove obsolete magit-diff-use-overlays variable
Diffstat:
| M | solarized-faces.el | | | 89 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------- |
1 file changed, 64 insertions(+), 25 deletions(-)
diff --git a/solarized-faces.el b/solarized-faces.el
@@ -1013,33 +1013,68 @@
`(macrostep-expansion-highlight-face ((,class (:background ,base02))))
;;;;; magit
;;;;;; headings and diffs
- `(magit-section-highlight ((t (:background ,base02))))
+ `(magit-section-highlight
+ ((t (,@(and (>= emacs-major-version 27) '(:extend t))
+ :background ,base02))))
`(magit-section-heading ((t (:foreground ,yellow :weight bold))))
`(magit-section-heading-selection ((t (:foreground ,orange :weight bold))))
`(magit-diff-file-heading ((t (:weight bold))))
- `(magit-diff-file-heading-highlight ((t (:background ,base02))))
- `(magit-diff-file-heading-selection ((t (:background ,base02
- :foreground ,orange))))
- `(magit-diff-hunk-heading ((t (:background ,yellow-1bg :foreground ,yellow-1fg))))
- `(magit-diff-hunk-heading-highlight ((t (:background ,yellow-2bg :foreground ,yellow-2fg))))
+ `(magit-diff-file-heading-highlight
+ ((t (,@(and (>= emacs-major-version 27) '(:extend t))
+ :background ,base02))))
+ `(magit-diff-file-heading-selection
+ ((t (,@(and (>= emacs-major-version 27) '(:extend t))
+ :background ,base02
+ :foreground ,orange))))
+ `(magit-diff-hunk-heading
+ ((t (,@(and (>= emacs-major-version 27) '(:extend t))
+ :background ,yellow-1bg
+ :foreground ,yellow-1fg))))
+ `(magit-diff-hunk-heading-highlight
+ ((t (,@(and (>= emacs-major-version 27) '(:extend t))
+ :background ,yellow-2bg
+ :foreground ,yellow-2fg))))
`(magit-diff-hunk-heading-selection
- ((t (:background ,(solarized-color-blend yellow base02 0.1)
- :foreground ,orange
- :weight bold))))
- `(magit-diff-lines-heading ((t (:background ,orange
- :foreground ,base3))))
- `(magit-diff-context-highlight ((t (:background ,base02 :foreground ,base1))))
- `(magit-diff-added ((,class (:background ,green-1bg :foreground ,green-1fg))))
- `(magit-diff-added-highlight ((,class (:background ,green-1bg :foreground ,green-1fg))))
- `(magit-diff-base ((,class (:background ,yellow-1bg :foreground ,yellow-1fg))))
- `(magit-diff-base-highlight ((,class (:background ,yellow-1bg :foreground ,yellow-1fg))))
+ ((t (,@(and (>= emacs-major-version 27) '(:extend t))
+ :background ,(solarized-color-blend yellow base02 0.1)
+ :foreground ,orange
+ :weight bold))))
+ `(magit-diff-lines-heading
+ ((t (,@(and (>= emacs-major-version 27) '(:extend t))
+ :background ,orange
+ :foreground ,base3))))
+ `(magit-diff-context-highlight
+ ((t (,@(and (>= emacs-major-version 27) '(:extend t))
+ :background ,base02
+ :foreground ,base1))))
+ `(magit-diff-added
+ ((,class (,@(and (>= emacs-major-version 27) '(:extend t))
+ :background ,green-1bg
+ :foreground ,green-1fg))))
+ `(magit-diff-added-highlight
+ ((,class (,@(and (>= emacs-major-version 27) '(:extend t))
+ :background ,green-1bg
+ :foreground ,green-1fg))))
+ `(magit-diff-base
+ ((,class (,@(and (>= emacs-major-version 27) '(:extend t))
+ :background ,yellow-1bg
+ :foreground ,yellow-1fg))))
+ `(magit-diff-base-highlight
+ ((,class (,@(and (>= emacs-major-version 27) '(:extend t))
+ :background ,yellow-1bg
+ :foreground ,yellow-1fg))))
`(magit-diff-conflict-heading ((,class (:inherit magit-diff-hunk-heading))))
- `(magit-diff-context ((,class (:foreground ,base0))))
- `(magit-diff-removed ((,class (:background ,red-1bg :foreground ,red-1fg))))
- `(magit-diff-removed-highlight ((,class (:background ,red-1bg :foreground ,red-1fg))))
-
- `(magit-diffstat-added ((t (:foreground ,s-diffstat-added-fg))))
- `(magit-diffstat-removed ((t (:foreground ,s-diffstat-removed-fg))))
+ `(magit-diff-context ((,class (:foreground ,base0))))
+ `(magit-diff-removed
+ ((,class (,@(and (>= emacs-major-version 27) '(:extend t))
+ :background ,red-1bg
+ :foreground ,red-1fg))))
+ `(magit-diff-removed-highlight
+ ((,class (,@(and (>= emacs-major-version 27) '(:extend t))
+ :background ,red-1bg
+ :foreground ,red-1fg))))
+ `(magit-diffstat-added ((t (:foreground ,s-diffstat-added-fg))))
+ `(magit-diffstat-removed ((t (:foreground ,s-diffstat-removed-fg))))
;;;;;; process
`(magit-process-ok ((t (:foreground ,green :weight bold))))
`(magit-process-ng ((t (:foreground ,red :weight bold))))
@@ -1060,9 +1095,13 @@
`(magit-bisect-skip ((t (:foreground ,yellow))))
`(magit-bisect-bad ((t (:foreground ,red))))
;;;;;; blame
- `(magit-blame-highlight ((t (:background ,base02))))
- `(magit-blame-heading ((t (:inherit magit-blame-highlight
- :box (:color ,base02 :line-width 2)))))
+ `(magit-blame-highlight
+ ((t (,@(and (>= emacs-major-version 27) '(:extend t))
+ :background ,base02))))
+ `(magit-blame-heading
+ ((t (,@(and (>= emacs-major-version 27) '(:extend t))
+ :background ,base02
+ :box (:color ,base02 :line-width 2)))))
`(magit-blame-summary ((t (:foreground ,base0))))
`(magit-blame-hash ((t (:foreground ,violet))))
`(magit-blame-name ((t (:foreground ,violet))))
