diff options
| author | Juri Linkov | 2020-06-08 03:21:42 +0300 |
|---|---|---|
| committer | Juri Linkov | 2020-06-08 03:21:42 +0300 |
| commit | 6eb18a950db88515fa5103e1c7d9cd76980e5f91 (patch) | |
| tree | ab41ae10834fc04711da413b573abfa8902f60fb | |
| parent | 35661ef943d261f6c43e93e475ddd8516f4a4b62 (diff) | |
| download | emacs-6eb18a950db88515fa5103e1c7d9cd76980e5f91.tar.gz emacs-6eb18a950db88515fa5103e1c7d9cd76980e5f91.zip | |
Move tab-bar and tab-line faces to faces.el (part of bug#41200)
These are basic faces, so they need to be defined in
faces.el, otherwise (get 'tab-line 'face) returns 0.
* lisp/faces.el (tab-bar, tab-line): Move faces here
from tab-bar.el and tab-line.el.
* lisp/tab-bar.el (tab-bar): Move face to faces.el.
(tab-bar-faces): Add '((tab-bar custom-face))
to the second arg MEMBERS of 'defgroup'.
* lisp/tab-line.el (tab-line): Move face to faces.el.
(tab-line-faces): Add '((tab-line custom-face))
to the second arg MEMBERS of 'defgroup'.
| -rw-r--r-- | lisp/faces.el | 27 | ||||
| -rw-r--r-- | lisp/tab-bar.el | 15 | ||||
| -rw-r--r-- | lisp/tab-line.el | 16 |
3 files changed, 29 insertions, 29 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 9a49ea81042..4d1d9561d49 100644 --- a/lisp/faces.el +++ b/lisp/faces.el | |||
| @@ -2738,6 +2738,33 @@ Note: Other faces cannot inherit from the cursor face." | |||
| 2738 | :version "21.1" | 2738 | :version "21.1" |
| 2739 | :group 'basic-faces) | 2739 | :group 'basic-faces) |
| 2740 | 2740 | ||
| 2741 | (defface tab-bar | ||
| 2742 | '((((class color) (min-colors 88)) | ||
| 2743 | :inherit variable-pitch | ||
| 2744 | :background "grey85" | ||
| 2745 | :foreground "black") | ||
| 2746 | (((class mono)) | ||
| 2747 | :background "grey") | ||
| 2748 | (t | ||
| 2749 | :inverse-video t)) | ||
| 2750 | "Tab bar face." | ||
| 2751 | :version "27.1" | ||
| 2752 | :group 'basic-faces) | ||
| 2753 | |||
| 2754 | (defface tab-line | ||
| 2755 | '((((class color) (min-colors 88)) | ||
| 2756 | :inherit variable-pitch | ||
| 2757 | :height 0.9 | ||
| 2758 | :background "grey85" | ||
| 2759 | :foreground "black") | ||
| 2760 | (((class mono)) | ||
| 2761 | :background "grey") | ||
| 2762 | (t | ||
| 2763 | :inverse-video t)) | ||
| 2764 | "Tab line face." | ||
| 2765 | :version "27.1" | ||
| 2766 | :group 'basic-faces) | ||
| 2767 | |||
| 2741 | (defface menu | 2768 | (defface menu |
| 2742 | '((((type tty)) | 2769 | '((((type tty)) |
| 2743 | :inverse-video t) | 2770 | :inverse-video t) |
diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el index 5c237e7130e..d97ca37a731 100644 --- a/lisp/tab-bar.el +++ b/lisp/tab-bar.el | |||
| @@ -44,25 +44,12 @@ | |||
| 44 | :group 'convenience | 44 | :group 'convenience |
| 45 | :version "27.1") | 45 | :version "27.1") |
| 46 | 46 | ||
| 47 | (defgroup tab-bar-faces nil | 47 | (defgroup tab-bar-faces '((tab-bar custom-face)) ; tab-bar is defined in faces.el |
| 48 | "Faces used in the tab bar." | 48 | "Faces used in the tab bar." |
| 49 | :group 'tab-bar | 49 | :group 'tab-bar |
| 50 | :group 'faces | 50 | :group 'faces |
| 51 | :version "27.1") | 51 | :version "27.1") |
| 52 | 52 | ||
| 53 | (defface tab-bar | ||
| 54 | '((((class color) (min-colors 88)) | ||
| 55 | :inherit variable-pitch | ||
| 56 | :background "grey85" | ||
| 57 | :foreground "black") | ||
| 58 | (((class mono)) | ||
| 59 | :background "grey") | ||
| 60 | (t | ||
| 61 | :inverse-video t)) | ||
| 62 | "Tab bar face." | ||
| 63 | :version "27.1" | ||
| 64 | :group 'tab-bar-faces) | ||
| 65 | |||
| 66 | (defface tab-bar-tab | 53 | (defface tab-bar-tab |
| 67 | '((default | 54 | '((default |
| 68 | :inherit tab-bar) | 55 | :inherit tab-bar) |
diff --git a/lisp/tab-line.el b/lisp/tab-line.el index 7a2bdc0b72f..e8c4dc4d93c 100644 --- a/lisp/tab-line.el +++ b/lisp/tab-line.el | |||
| @@ -35,26 +35,12 @@ | |||
| 35 | :group 'convenience | 35 | :group 'convenience |
| 36 | :version "27.1") | 36 | :version "27.1") |
| 37 | 37 | ||
| 38 | (defgroup tab-line-faces nil | 38 | (defgroup tab-line-faces '((tab-line custom-face)) ; tab-line is defined in faces.el |
| 39 | "Faces used in the tab line." | 39 | "Faces used in the tab line." |
| 40 | :group 'tab-line | 40 | :group 'tab-line |
| 41 | :group 'faces | 41 | :group 'faces |
| 42 | :version "27.1") | 42 | :version "27.1") |
| 43 | 43 | ||
| 44 | (defface tab-line | ||
| 45 | '((((class color) (min-colors 88)) | ||
| 46 | :inherit variable-pitch | ||
| 47 | :height 0.9 | ||
| 48 | :background "grey85" | ||
| 49 | :foreground "black") | ||
| 50 | (((class mono)) | ||
| 51 | :background "grey") | ||
| 52 | (t | ||
| 53 | :inverse-video t)) | ||
| 54 | "Tab line face." | ||
| 55 | :version "27.1" | ||
| 56 | :group 'tab-line-faces) | ||
| 57 | |||
| 58 | (defface tab-line-tab | 44 | (defface tab-line-tab |
| 59 | '((default | 45 | '((default |
| 60 | :inherit tab-line) | 46 | :inherit tab-line) |