[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/modus-vivendi-theme 8317484 27/35: Fix Ibuffer dependen
|
From: |
Stefan Monnier |
|
Subject: |
[elpa] externals/modus-vivendi-theme 8317484 27/35: Fix Ibuffer dependency on Dired faces |
|
Date: |
Wed, 24 Jun 2020 12:42:50 -0400 (EDT) |
branch: externals/modus-vivendi-theme
commit 8317484328a9ecf2b28174b8493b035343aebe7e
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>
Fix Ibuffer dependency on Dired faces
For discussion, see merge requests !3 and !4:
https://gitlab.com/protesilaos/modus-themes/-/merge_requests/3/
https://gitlab.com/protesilaos/modus-themes/-/merge_requests/4/
* modus-operandi-theme.el (modus-theme-flagged, modus-theme-header)
(modus-theme-mark, modus-theme-marked):
* modus-vivendi-theme.el (modus-theme-flagged, modus-theme-header)
(modus-theme-mark, modus-theme-marked): New faces for decoupling
Ibuffer user options from faces defined in Dired.
---
modus-operandi-theme.el | 35 ++++++++++++++++++++++-------------
modus-vivendi-theme.el | 35 ++++++++++++++++++++++-------------
2 files changed, 44 insertions(+), 26 deletions(-)
diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el
index 14a300b..34fd45e 100644
--- a/modus-operandi-theme.el
+++ b/modus-operandi-theme.el
@@ -383,6 +383,10 @@ between foreground and background is >= 7:1)."
(defface modus-theme-diff-focus-changed nil t)
(defface modus-theme-diff-focus-removed nil t)
(defface modus-theme-diff-heading nil t)
+(defface modus-theme-flagged nil t)
+(defface modus-theme-header nil t)
+(defface modus-theme-mark nil t)
+(defface modus-theme-marked nil t)
;; User-facing customisation options. They are all deactivated by
;; default (users must opt in).
@@ -840,6 +844,11 @@ Also bind `class' to ((class color) (min-colors 89))."
`(modus-theme-diff-focus-changed ((,class (:background
,bg-diff-focus-changed :foreground ,fg-diff-focus-changed))))
`(modus-theme-diff-focus-removed ((,class (:background
,bg-diff-focus-removed :foreground ,fg-diff-focus-removed))))
`(modus-theme-diff-heading ((,class (:background ,bg-diff-heading
:foreground ,fg-diff-heading))))
+ ;;; colour combinations intended for Dired, Ibuffer, or equivalent
+ `(modus-theme-flagged ((,class (:background ,bg-mark-del :foreground
,fg-mark-del :weight bold))))
+ `(modus-theme-header ((,class (:foreground ,fg-main :weight bold))))
+ `(modus-theme-mark ((,class (:foreground ,blue-alt :weight bold))))
+ `(modus-theme-marked ((,class (:background ,bg-mark :foreground ,fg-mark
:weight bold))))
;;;;;;;;;;;;;;;;;;;
;; actual styles ;;
;;;;;;;;;;;;;;;;;;;
@@ -1333,11 +1342,11 @@ Also bind `class' to ((class color) (min-colors 89))."
`(dim-autoload-cookie-line ((,class (:foreground ,fg-alt :slant
,modus-theme-slant))))
;;;; dired
`(dired-directory ((,class (:foreground ,blue))))
- `(dired-flagged ((,class (:background ,bg-mark-del :foreground ,fg-mark-del
:weight bold))))
- `(dired-header ((,class (:foreground ,fg-main :weight bold))))
+ `(dired-flagged ((,class (:inherit modus-theme-flagged))))
+ `(dired-header ((,class (:inherit modus-theme-header))))
`(dired-ignored ((,class (:foreground ,fg-alt))))
- `(dired-mark ((,class (:foreground ,blue-alt :weight bold))))
- `(dired-marked ((,class (:background ,bg-mark :foreground ,fg-mark :weight
bold))))
+ `(dired-mark ((,class (:inherit modus-theme-mark))))
+ `(dired-marked ((,class (:inherit modus-theme-marked))))
`(dired-perm-write ((,class (:foreground ,fg-special-warm))))
`(dired-symlink ((,class (:foreground ,blue-alt :underline t))))
`(dired-warning ((,class (:foreground ,yellow :weight bold))))
@@ -1367,17 +1376,17 @@ Also bind `class' to ((class color) (min-colors 89))."
`(diredfl-compressed-file-name ((,class (:foreground ,green-alt-other))))
`(diredfl-compressed-file-suffix ((,class (:foreground ,green-alt))))
`(diredfl-date-time ((,class (:foreground ,fg-special-cold))))
- `(diredfl-deletion ((,class (:inherit dired-flagged))))
- `(diredfl-deletion-file-name ((,class (:inherit dired-flagged))))
- `(diredfl-dir-heading ((,class (:inherit dired-header))))
+ `(diredfl-deletion ((,class (:inherit modus-theme-flagged))))
+ `(diredfl-deletion-file-name ((,class (:inherit modus-theme-flagged))))
+ `(diredfl-dir-heading ((,class (:inherit modus-theme-header))))
`(diredfl-dir-name ((,class (:inherit dired-directory))))
`(diredfl-dir-priv ((,class (:foreground ,blue))))
`(diredfl-exec-priv ((,class (:foreground ,red-alt-other))))
`(diredfl-executable-tag ((,class (:foreground ,red-alt))))
`(diredfl-file-name ((,class (:foreground ,fg-main))))
`(diredfl-file-suffix ((,class (:foreground ,fg-special-warm))))
- `(diredfl-flag-mark ((,class (:inherit dired-marked))))
- `(diredfl-flag-mark-line ((,class (:inherit dired-marked))))
+ `(diredfl-flag-mark ((,class (:inherit modus-theme-marked))))
+ `(diredfl-flag-mark-line ((,class (:inherit modus-theme-marked))))
`(diredfl-ignored-file-name ((,class (:foreground ,fg-inactive))))
`(diredfl-link-priv ((,class (:foreground ,blue-alt-other))))
`(diredfl-no-priv ((,class (:foreground ,fg-inactive))))
@@ -3482,10 +3491,10 @@ Also bind `class' to ((class color) (min-colors 89))."
`(flymake-warning-bitmap '(exclamation-mark modus-theme-fringe-yellow))
`(flymake-note-bitmap '(exclamation-mark modus-theme-fringe-cyan))
;;;; ibuffer
- `(ibuffer-deletion-face 'dired-flagged)
- `(ibuffer-filter-group-name-face 'dired-mark)
- `(ibuffer-marked-face 'dired-marked)
- `(ibuffer-title-face 'dired-header)
+ `(ibuffer-deletion-face 'modus-theme-flagged)
+ `(ibuffer-filter-group-name-face 'modus-theme-mark)
+ `(ibuffer-marked-face 'modus-theme-marked)
+ `(ibuffer-title-face 'modus-theme-header)
;;;; hl-todo
`(hl-todo-keyword-faces
'(("HOLD" . ,yellow-alt)
diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el
index c887337..ade5a77 100644
--- a/modus-vivendi-theme.el
+++ b/modus-vivendi-theme.el
@@ -383,6 +383,10 @@ between foreground and background is >= 7:1)."
(defface modus-theme-diff-focus-changed nil t)
(defface modus-theme-diff-focus-removed nil t)
(defface modus-theme-diff-heading nil t)
+(defface modus-theme-flagged nil t)
+(defface modus-theme-header nil t)
+(defface modus-theme-mark nil t)
+(defface modus-theme-marked nil t)
;; User-facing customisation options. They are all deactivated by
;; default (users must opt in).
@@ -840,6 +844,11 @@ Also bind `class' to ((class color) (min-colors 89))."
`(modus-theme-diff-focus-changed ((,class (:background
,bg-diff-focus-changed :foreground ,fg-diff-focus-changed))))
`(modus-theme-diff-focus-removed ((,class (:background
,bg-diff-focus-removed :foreground ,fg-diff-focus-removed))))
`(modus-theme-diff-heading ((,class (:background ,bg-diff-heading
:foreground ,fg-diff-heading))))
+ ;;; colour combinations intended for Dired, Ibuffer, or equivalent
+ `(modus-theme-flagged ((,class (:background ,bg-mark-del :foreground
,fg-mark-del :weight bold))))
+ `(modus-theme-header ((,class (:foreground ,fg-main :weight bold))))
+ `(modus-theme-mark ((,class (:foreground ,blue-alt :weight bold))))
+ `(modus-theme-marked ((,class (:background ,bg-mark :foreground ,fg-mark
:weight bold))))
;;;;;;;;;;;;;;;;;;;
;; actual styles ;;
;;;;;;;;;;;;;;;;;;;
@@ -1333,11 +1342,11 @@ Also bind `class' to ((class color) (min-colors 89))."
`(dim-autoload-cookie-line ((,class (:foreground ,fg-alt :slant
,modus-theme-slant))))
;;;; dired
`(dired-directory ((,class (:foreground ,blue))))
- `(dired-flagged ((,class (:background ,bg-mark-del :foreground ,fg-mark-del
:weight bold))))
- `(dired-header ((,class (:foreground ,fg-main :weight bold))))
+ `(dired-flagged ((,class (:inherit modus-theme-flagged))))
+ `(dired-header ((,class (:inherit modus-theme-header))))
`(dired-ignored ((,class (:foreground ,fg-alt))))
- `(dired-mark ((,class (:foreground ,blue-alt :weight bold))))
- `(dired-marked ((,class (:background ,bg-mark :foreground ,fg-mark :weight
bold))))
+ `(dired-mark ((,class (:inherit modus-theme-mark))))
+ `(dired-marked ((,class (:inherit modus-theme-marked))))
`(dired-perm-write ((,class (:foreground ,fg-special-warm))))
`(dired-symlink ((,class (:foreground ,blue-alt :underline t))))
`(dired-warning ((,class (:foreground ,yellow :weight bold))))
@@ -1367,17 +1376,17 @@ Also bind `class' to ((class color) (min-colors 89))."
`(diredfl-compressed-file-name ((,class (:foreground ,green-alt-other))))
`(diredfl-compressed-file-suffix ((,class (:foreground ,green-alt))))
`(diredfl-date-time ((,class (:foreground ,fg-special-cold))))
- `(diredfl-deletion ((,class (:inherit dired-flagged))))
- `(diredfl-deletion-file-name ((,class (:inherit dired-flagged))))
- `(diredfl-dir-heading ((,class (:inherit dired-header))))
+ `(diredfl-deletion ((,class (:inherit modus-theme-flagged))))
+ `(diredfl-deletion-file-name ((,class (:inherit modus-theme-flagged))))
+ `(diredfl-dir-heading ((,class (:inherit modus-theme-header))))
`(diredfl-dir-name ((,class (:inherit dired-directory))))
`(diredfl-dir-priv ((,class (:foreground ,blue))))
`(diredfl-exec-priv ((,class (:foreground ,red-alt-other))))
`(diredfl-executable-tag ((,class (:foreground ,red-alt))))
`(diredfl-file-name ((,class (:foreground ,fg-main))))
`(diredfl-file-suffix ((,class (:foreground ,fg-special-warm))))
- `(diredfl-flag-mark ((,class (:inherit dired-marked))))
- `(diredfl-flag-mark-line ((,class (:inherit dired-marked))))
+ `(diredfl-flag-mark ((,class (:inherit modus-theme-marked))))
+ `(diredfl-flag-mark-line ((,class (:inherit modus-theme-marked))))
`(diredfl-ignored-file-name ((,class (:foreground ,fg-inactive))))
`(diredfl-link-priv ((,class (:foreground ,blue-alt-other))))
`(diredfl-no-priv ((,class (:foreground ,fg-inactive))))
@@ -3482,10 +3491,10 @@ Also bind `class' to ((class color) (min-colors 89))."
`(flymake-warning-bitmap '(exclamation-mark modus-theme-fringe-yellow))
`(flymake-note-bitmap '(exclamation-mark modus-theme-fringe-cyan))
;;;; ibuffer
- `(ibuffer-deletion-face 'dired-flagged)
- `(ibuffer-filter-group-name-face 'dired-mark)
- `(ibuffer-marked-face 'dired-marked)
- `(ibuffer-title-face 'dired-header)
+ `(ibuffer-deletion-face 'modus-theme-flagged)
+ `(ibuffer-filter-group-name-face 'modus-theme-mark)
+ `(ibuffer-marked-face 'modus-theme-marked)
+ `(ibuffer-title-face 'modus-theme-header)
;;;; hl-todo
`(hl-todo-keyword-faces
'(("HOLD" . ,yellow-alt)
- [elpa] externals/modus-vivendi-theme 0d9c90c 19/35: Major review of DIREDFL faces, (continued)
- [elpa] externals/modus-vivendi-theme 0d9c90c 19/35: Major review of DIREDFL faces, Stefan Monnier, 2020/06/24
- [elpa] externals/modus-vivendi-theme 9b8c0c8 20/35: Make diff indicators better for subtle diff option, Stefan Monnier, 2020/06/24
- [elpa] externals/modus-vivendi-theme 2c55c0f 21/35: Differentiate 'message-mml', 'message-header-name', Stefan Monnier, 2020/06/24
- [elpa] externals/modus-vivendi-theme f1a22b5 22/35: Make 'message-separator' more intense greyscale, Stefan Monnier, 2020/06/24
- [elpa] externals/modus-vivendi-theme 695f459 24/35: Expand README with demo for custom colour values, Stefan Monnier, 2020/06/24
- [elpa] externals/modus-vivendi-theme 38471df 25/35: Minor amendment to commit f1a22b5e3, Stefan Monnier, 2020/06/24
- [elpa] externals/modus-vivendi-theme c28d472 29/35: Don't give deffaces an invalid docstring, Stefan Monnier, 2020/06/24
- [elpa] externals/modus-vivendi-theme c0d35ae 32/35: Use appropriate colour for symlinks, Stefan Monnier, 2020/06/24
- [elpa] externals/modus-vivendi-theme f264a89 35/35: Merge branch 'master' into local branch, Stefan Monnier, 2020/06/24
- [elpa] externals/modus-vivendi-theme 25de45e 23/35: Tweak README advanced customisation example, Stefan Monnier, 2020/06/24
- [elpa] externals/modus-vivendi-theme 8317484 27/35: Fix Ibuffer dependency on Dired faces,
Stefan Monnier <=
- [elpa] externals/modus-vivendi-theme 4068405 33/35: Define palette as a constant, Stefan Monnier, 2020/06/24
- [elpa] externals/modus-vivendi-theme deda7db 26/35: Fix parentheses and indentation, Stefan Monnier, 2020/06/24
- [elpa] externals/modus-vivendi-theme bfa6650 28/35: Review internal "mark" faces, Stefan Monnier, 2020/06/24
- [elpa] externals/modus-vivendi-theme 776977c 30/35: Use modern (DISPLAY . PLIST) face spec entries, Stefan Monnier, 2020/06/24
- [elpa] externals/modus-vivendi-theme 9d5f815 31/35: Remove unwanted underline in doom-modeline-urgent, Stefan Monnier, 2020/06/24
- [elpa] externals/modus-vivendi-theme aa3897c 34/35: Upgrade to version 0.10.0, Stefan Monnier, 2020/06/24