diff options
| author | Kévin Le Gouguec <kevin.legouguec@gmail.com> | 2019-05-25 13:09:25 +0200 |
|---|---|---|
| committer | Kévin Le Gouguec <kevin.legouguec@gmail.com> | 2019-05-25 13:10:48 +0200 |
| commit | 69b119d2dc7a3acbd454b345e5a171b416f67727 (patch) | |
| tree | 3a5e431bcf1b2efb3b8d84ba81ec6573ec27eb75 | |
| parent | 8af6e2d54067749891a732329a99602169ff6512 (diff) | |
| download | eighters-theme-69b119d2dc7a3acbd454b345e5a171b416f67727.tar.xz | |
Fix smerge faces and prepare for The Diff Revamp
Also remove TODO for Man-overstrike; I just don't care enough to think
about this.
| -rw-r--r-- | eighters-theme.el | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/eighters-theme.el b/eighters-theme.el index 3e3391a..9bc04f3 100644 --- a/eighters-theme.el +++ b/eighters-theme.el @@ -1,11 +1,29 @@ (deftheme eighters "Eighters gonna eight.") -;; TODO: make "bold" face whiter? (see Man-overstrike) -;; TODO: make diff faces stand out more ;; TODO: unset "inverse" on mode-line face; it messes up with ;; foreground/background colors on custom lighters +;; TODO: remove foreground of diff faces to make patches more readble; +;; model them on current ediff? faces to juggle with: +;; +;; - diff-xxx +;; - diff-refine-xxx +;; - diff-indicator-xxx +;; +;; - ediff-current-diff-X +;; - ediff-fine-diff-A +;; +;; - diff-hl-xxx +;; +;; - magit-diff-xxx +;; - magit-diff-xxx-highlight +;; - magit-diffstat-xxx +;; +;; - smerge-xxx +;; - smerge-refined-xxx + + ;; The default face's font and height are not defined, so that they ;; can be set individually for different computers in .Xresources; see ;; xrdb(1), Xsession(5) and (emacs) Fonts. @@ -74,8 +92,8 @@ '(smerge-base ((t (:inherit (ediff-current-diff-C))))) '(smerge-upper ((t (:inherit (ediff-current-diff-A))))) '(smerge-lower ((t (:inherit (ediff-current-diff-B))))) - '(smerge-refined-added ((t (:inherit ediff-fine-diff-A)))) - '(smerge-refined-removed ((t (:inherit ediff-fine-diff-B)))) + '(smerge-refined-removed ((t (:inherit ediff-fine-diff-A)))) + '(smerge-refined-added ((t (:inherit ediff-fine-diff-B)))) '(term-color-black ((t (:foreground "black" :background "black")))) '(term-color-blue ((t (:foreground "steelblue1" :background "steelblue1")))) '(term-color-cyan ((t (:foreground "cyan" :background "cyan")))) |
