diff options
| -rw-r--r-- | CHANGELOG.org | 5 | ||||
| -rw-r--r-- | yoshi-theme.el | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/CHANGELOG.org b/CHANGELOG.org index 72ba088..44c16c0 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -39,6 +39,11 @@ This project adheres to [[http://semver.org][Semantic Versioning]]. With =org-fontify-whole-block-delimiter-line= set to =t= the org block colors have a better appearance. +** ADDED Some ediff faces + + Add the ediff faces: =ediff-even-diff-A=, =ediff-even-diff-B=, =ediff-odd-diff-A=, + and =ediff-odd-diff-B=. + * [[https://github.com/ryuslash/yoshi-theme/compare/v6.1.0...v6.2.0][6.2.0]] -- 2019-05-05 :PROPERTIES: :CUSTOM_ID: release-6.2.0 diff --git a/yoshi-theme.el b/yoshi-theme.el index 5019868..0a72b88 100644 --- a/yoshi-theme.el +++ b/yoshi-theme.el @@ -136,9 +136,13 @@ `(ediff-current-diff-A ((t (:inherit diff-removed)))) `(ediff-current-diff-B ((t (:inherit diff-added)))) `(ediff-current-diff-C ((t (:inherit diff-changed)))) + `(ediff-even-diff-A ((t (:background ,bgyellow)))) + `(ediff-even-diff-B ((t (:background ,bgyellow)))) `(ediff-fine-diff-A ((t (:inherit diff-refine-removed)))) `(ediff-fine-diff-B ((t (:inherit diff-refine-added)))) `(ediff-fine-diff-C ((t (:inherit diff-refine-change)))) + `(ediff-odd-diff-A ((t (:background ,bgyellow)))) + `(ediff-odd-diff-B ((t (:background ,bgyellow)))) ;;; ERC `(erc-button ((t (:weight unspecified :inherit button)))) |