Mercurial > emacs
annotate lisp/cus-face.el @ 57671:4c62dfe8a868
Mention process-file.
author | Kai Großjohann <kgrossjo@eu.uu.net> |
---|---|
date | Sun, 24 Oct 2004 13:26:10 +0000 |
parents | 16a8650c3814 |
children | da0a523ffb17 38500c0c86ab 4c90ffeb71c5 |
rev | line source |
---|---|
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
33939
diff
changeset
|
1 ;;; cus-face.el --- customization support for faces |
17334 | 2 ;; |
48950
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
3 ;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. |
17334 | 4 ;; |
5 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> | |
6 ;; Keywords: help, faces | |
7 | |
17524
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
8 ;; This file is part of GNU Emacs. |
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
9 |
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
10 ;; GNU Emacs is free software; you can redistribute it and/or modify |
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
11 ;; it under the terms of the GNU General Public License as published by |
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
12 ;; the Free Software Foundation; either version 2, or (at your option) |
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
13 ;; any later version. |
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
14 |
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
15 ;; GNU Emacs is distributed in the hope that it will be useful, |
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
18 ;; GNU General Public License for more details. |
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
19 |
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
20 ;; You should have received a copy of the GNU General Public License |
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
23 ;; Boston, MA 02111-1307, USA. |
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
24 |
17334 | 25 ;;; Commentary: |
26 ;; | |
27 ;; See `custom.el'. | |
28 | |
29 ;;; Code: | |
30 | |
24984 | 31 (defalias 'custom-facep 'facep) |
17856
1e5f1a1f0db3
(custom-facep): Defined (once again).
Richard M. Stallman <rms@gnu.org>
parents:
17568
diff
changeset
|
32 |
17334 | 33 ;;; Declaring a face. |
34 | |
35 ;;;###autoload | |
36 (defun custom-declare-face (face spec doc &rest args) | |
37 "Like `defface', but FACE is evaluated as a normal argument." | |
17524
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
38 (unless (get face 'face-defface-spec) |
17334 | 39 (when (fboundp 'facep) |
17524
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
40 (unless (facep face) |
17334 | 41 ;; If the user has already created the face, respect that. |
56079
16a8650c3814
(custom-declare-face): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
42 (let ((value (or (get face 'saved-face) spec))) |
17334 | 43 ;; Create global face. |
44 (make-empty-face face) | |
48521
e8d332923257
(custom-declare-face): Add face-defface-spec prop after applying the
Richard M. Stallman <rms@gnu.org>
parents:
44471
diff
changeset
|
45 ;; Create frame-local faces |
56079
16a8650c3814
(custom-declare-face): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
46 (dolist (frame (frame-list)) |
19257
e487ed925a50
(custom-declare-face): Call make-face-x-resource-internal.
Richard M. Stallman <rms@gnu.org>
parents:
18935
diff
changeset
|
47 (face-spec-set face value frame))) |
e487ed925a50
(custom-declare-face): Call make-face-x-resource-internal.
Richard M. Stallman <rms@gnu.org>
parents:
18935
diff
changeset
|
48 ;; When making a face after frames already exist |
e487ed925a50
(custom-declare-face): Call make-face-x-resource-internal.
Richard M. Stallman <rms@gnu.org>
parents:
18935
diff
changeset
|
49 (if (memq window-system '(x w32)) |
e487ed925a50
(custom-declare-face): Call make-face-x-resource-internal.
Richard M. Stallman <rms@gnu.org>
parents:
18935
diff
changeset
|
50 (make-face-x-resource-internal face)))) |
48521
e8d332923257
(custom-declare-face): Add face-defface-spec prop after applying the
Richard M. Stallman <rms@gnu.org>
parents:
44471
diff
changeset
|
51 ;; Don't record SPEC until we see it causes no errors. |
e8d332923257
(custom-declare-face): Add face-defface-spec prop after applying the
Richard M. Stallman <rms@gnu.org>
parents:
44471
diff
changeset
|
52 (put face 'face-defface-spec spec) |
18935
ab4cd3135797
(custom-declare-face): Use [set-]face-documentation.
Richard M. Stallman <rms@gnu.org>
parents:
18599
diff
changeset
|
53 (when (and doc (null (face-documentation face))) |
26583
3251a6750150
(custom-declare-face): Purecopy DOC.
Dave Love <fx@gnu.org>
parents:
25684
diff
changeset
|
54 (set-face-documentation face (purecopy doc))) |
17334 | 55 (custom-handle-all-keywords face args 'custom-face) |
56 (run-hooks 'custom-define-hook)) | |
57 face) | |
58 | |
24984 | 59 ;;; Face attributes. |
60 | |
17334 | 61 (defconst custom-face-attributes |
24984 | 62 '((:family |
39607
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
63 (string :tag "Font Family" |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
64 :help-echo "Font family or fontset alias name.")) |
48950
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
65 |
24984 | 66 (:width |
67 (choice :tag "Width" | |
68 :help-echo "Font width." | |
39607
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
69 :value normal ; default |
24984 | 70 (const :tag "compressed" condensed) |
71 (const :tag "condensed" condensed) | |
72 (const :tag "demiexpanded" semi-expanded) | |
73 (const :tag "expanded" expanded) | |
74 (const :tag "extracondensed" extra-condensed) | |
75 (const :tag "extraexpanded" extra-expanded) | |
76 (const :tag "medium" normal) | |
77 (const :tag "narrow" condensed) | |
78 (const :tag "normal" normal) | |
79 (const :tag "regular" normal) | |
80 (const :tag "semicondensed" semi-condensed) | |
81 (const :tag "semiexpanded" semi-expanded) | |
82 (const :tag "ultracondensed" ultra-condensed) | |
83 (const :tag "ultraexpanded" ultra-expanded) | |
33844
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
84 (const :tag "wide" extra-expanded))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
85 |
24984 | 86 (:height |
87 (choice :tag "Height" | |
88 :help-echo "Face's font height." | |
39607
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
89 :value 1.0 ; default |
31192 | 90 (integer :tag "Height in 1/10 pt") |
33844
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
91 (number :tag "Scale" 1.0))) |
31192 | 92 |
24984 | 93 (:weight |
94 (choice :tag "Weight" | |
95 :help-echo "Font weight." | |
39607
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
96 :value normal ; default |
44471
b1d6fcf67b85
(custom-face-attributes): Fix typo in `ultra-bold'.
Richard M. Stallman <rms@gnu.org>
parents:
39607
diff
changeset
|
97 (const :tag "black" ultra-bold) |
24984 | 98 (const :tag "bold" bold) |
99 (const :tag "book" semi-light) | |
100 (const :tag "demibold" semi-bold) | |
101 (const :tag "extralight" extra-light) | |
102 (const :tag "extrabold" extra-bold) | |
103 (const :tag "heavy" extra-bold) | |
104 (const :tag "light" light) | |
105 (const :tag "medium" normal) | |
106 (const :tag "normal" normal) | |
107 (const :tag "regular" normal) | |
108 (const :tag "semibold" semi-bold) | |
109 (const :tag "semilight" semi-light) | |
110 (const :tag "ultralight" ultra-light) | |
33844
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
111 (const :tag "ultrabold" ultra-bold))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
112 |
24984 | 113 (:slant |
114 (choice :tag "Slant" | |
115 :help-echo "Font slant." | |
39607
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
116 :value normal ; default |
24984 | 117 (const :tag "italic" italic) |
118 (const :tag "oblique" oblique) | |
33844
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
119 (const :tag "normal" normal))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
120 |
24984 | 121 (:underline |
122 (choice :tag "Underline" | |
123 :help-echo "Control text underlining." | |
39607
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
124 (const :tag "Off" nil) |
24984 | 125 (const :tag "On" t) |
33844
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
126 (color :tag "Colored"))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
127 |
24984 | 128 (:overline |
129 (choice :tag "Overline" | |
130 :help-echo "Control text overlining." | |
39607
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
131 (const :tag "Off" nil) |
24984 | 132 (const :tag "On" t) |
33844
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
133 (color :tag "Colored"))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
134 |
24984 | 135 (:strike-through |
136 (choice :tag "Strike-through" | |
137 :help-echo "Control text strike-through." | |
39607
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
138 (const :tag "Off" nil) |
24984 | 139 (const :tag "On" t) |
33844
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
140 (color :tag "Colored"))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
141 |
24984 | 142 (:box |
25684
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
143 ;; Fixme: this can probably be done better. |
24984 | 144 (choice :tag "Box around text" |
145 :help-echo "Control box around text." | |
39607
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
146 (const :tag "Off" nil) |
24984 | 147 (list :tag "Box" |
33936
e66f3c5840a4
(custom-face-attributes): Add post-filter function for :box.
Miles Bader <miles@gnu.org>
parents:
33874
diff
changeset
|
148 :value (:line-width 2 :color "grey75" :style released-button) |
25684
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
149 (const :format "" :value :line-width) |
24984 | 150 (integer :tag "Width") |
25684
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
151 (const :format "" :value :color) |
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
152 (choice :tag "Color" (const :tag "*" nil) color) |
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
153 (const :format "" :value :style) |
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
154 (choice :tag "Style" |
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
155 (const :tag "Raised" released-button) |
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
156 (const :tag "Sunken" pressed-button) |
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
157 (const :tag "None" nil)))) |
33844
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
158 ;; filter to make value suitable for customize |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
159 (lambda (real-value) |
39607
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
160 (and real-value |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
161 (let ((lwidth |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
162 (or (and (consp real-value) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
163 (plist-get real-value :line-width)) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
164 (and (integerp real-value) real-value) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
165 1)) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
166 (color |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
167 (or (and (consp real-value) (plist-get real-value :color)) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
168 (and (stringp real-value) real-value) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
169 nil)) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
170 (style |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
171 (and (consp real-value) (plist-get real-value :style)))) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
172 (list :line-width lwidth :color color :style style)))) |
33936
e66f3c5840a4
(custom-face-attributes): Add post-filter function for :box.
Miles Bader <miles@gnu.org>
parents:
33874
diff
changeset
|
173 ;; filter to make customized-value suitable for storing |
e66f3c5840a4
(custom-face-attributes): Add post-filter function for :box.
Miles Bader <miles@gnu.org>
parents:
33874
diff
changeset
|
174 (lambda (cus-value) |
39607
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
175 (and cus-value |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
176 (let ((lwidth (plist-get cus-value :line-width)) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
177 (color (plist-get cus-value :color)) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
178 (style (plist-get cus-value :style))) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
179 (cond ((and (null color) (null style)) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
180 lwidth) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
181 ((and (null lwidth) (null style)) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
182 ;; actually can't happen, because LWIDTH is always an int |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
183 color) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
184 (t |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
185 ;; Keep as a plist, but remove null entries |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
186 (nconc (and lwidth `(:line-width ,lwidth)) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
187 (and color `(:color ,color)) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
188 (and style `(:style ,style))))))))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
189 |
24984 | 190 (:inverse-video |
191 (choice :tag "Inverse-video" | |
192 :help-echo "Control whether text should be in inverse-video." | |
39607
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
193 (const :tag "Off" nil) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
194 (const :tag "On" t))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
195 |
24984 | 196 (:foreground |
39607
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
197 (color :tag "Foreground" |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
198 :help-echo "Set foreground color.")) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
199 |
24984 | 200 (:background |
39607
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
201 (color :tag "Background" |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
202 :help-echo "Set background color.")) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
203 |
24984 | 204 (:stipple |
205 (choice :tag "Stipple" | |
33874
2dccf621b517
(custom-face-attributes): Add "None" choice to :stipple.
Miles Bader <miles@gnu.org>
parents:
33844
diff
changeset
|
206 :help-echo "Background bit-mask" |
39607
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
207 (const :tag "None" nil) |
33874
2dccf621b517
(custom-face-attributes): Add "None" choice to :stipple.
Miles Bader <miles@gnu.org>
parents:
33844
diff
changeset
|
208 (file :tag "File" |
2dccf621b517
(custom-face-attributes): Add "None" choice to :stipple.
Miles Bader <miles@gnu.org>
parents:
33844
diff
changeset
|
209 :help-echo "Name of bitmap file." |
2dccf621b517
(custom-face-attributes): Add "None" choice to :stipple.
Miles Bader <miles@gnu.org>
parents:
33844
diff
changeset
|
210 :must-match t))) |
31192 | 211 |
212 (:inherit | |
213 (repeat :tag "Inherit" | |
214 :help-echo "List of faces to inherit attributes from." | |
215 (face :Tag "Face" default)) | |
33844
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
216 ;; filter to make value suitable for customize |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
217 (lambda (real-value) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
218 (cond ((or (null real-value) (eq real-value 'unspecified)) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
219 nil) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
220 ((symbolp real-value) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
221 (list real-value)) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
222 (t |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
223 real-value))) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
224 ;; filter to make customized-value suitable for storing |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
225 (lambda (cus-value) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
226 (if (and (consp cus-value) (null (cdr cus-value))) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
227 (car cus-value) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
228 cus-value)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
229 |
24984 | 230 "Alist of face attributes. |
231 | |
33844
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
232 The elements are of the form (KEY TYPE PRE-FILTER POST-FILTER), |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
233 where KEY is the name of the attribute, TYPE is a widget type for |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
234 editing the attribute, PRE-FILTER is a function to make the attribute's |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
235 value suitable for the customization widget, and POST-FILTER is a |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
236 function to make the customized value suitable for storing. PRE-FILTER |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
237 and POST-FILTER are optional. |
17334 | 238 |
33844
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
239 The PRE-FILTER should take a single argument, the attribute value as |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
240 stored, and should return a value for customization (using the |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
241 customization type TYPE). |
17334 | 242 |
33844
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
243 The POST-FILTER should also take a single argument, the value after |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
244 being customized, and should return a value suitable for setting the |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
245 given face attribute.") |
17334 | 246 |
247 (defun custom-face-attributes-get (face frame) | |
17524
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
248 "For FACE on FRAME, return an alternating list describing its attributes. |
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
249 The list has the form (KEYWORD VALUE KEYWORD VALUE...). |
17334 | 250 Each keyword should be listed in `custom-face-attributes'. |
251 | |
17524
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
252 If FRAME is nil, use the global defaults for FACE." |
24984 | 253 (let ((attrs custom-face-attributes) |
254 plist) | |
255 (while attrs | |
256 (let* ((attribute (car (car attrs))) | |
257 (value (face-attribute face attribute frame))) | |
258 (setq attrs (cdr attrs)) | |
31192 | 259 (unless (or (eq value 'unspecified) |
260 (and (null value) (memq attribute '(:inherit)))) | |
24984 | 261 (setq plist (cons attribute (cons value plist)))))) |
262 plist)) | |
17334 | 263 |
264 ;;; Initializing. | |
265 | |
266 ;;;###autoload | |
267 (defun custom-set-faces (&rest args) | |
268 "Initialize faces according to user preferences. | |
48950
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
269 This associates the settings with the `user' theme. |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
270 The arguments should be a list where each entry has the form: |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
271 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
272 (FACE SPEC [NOW [COMMENT]]) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
273 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
274 SPEC is stored as the saved value for FACE, as well as the value for the |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
275 `user' theme. The `user' theme is one of the default themes known to Emacs. |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
276 See `custom-known-themes' for more information on the known themes. |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
277 See `custom-theme-set-faces' for more information on the interplay |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
278 between themes and faces. |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
279 See `defface' for the format of SPEC. |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
280 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
281 If NOW is present and non-nil, FACE is created now, according to SPEC. |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
282 COMMENT is a string comment about FACE." |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
283 (apply 'custom-theme-set-faces 'user args)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
284 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
285 (defun custom-theme-set-faces (theme &rest args) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
286 "Initialize faces for theme THEME. |
17334 | 287 The arguments should be a list where each entry has the form: |
288 | |
25684
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
289 (FACE SPEC [NOW [COMMENT]]) |
17334 | 290 |
48950
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
291 SPEC is stored as the saved value for FACE, as well as the value for the |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
292 `user' theme. The `user' theme is one of the default themes known to Emacs. |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
293 See `custom-known-themes' for more information on the known themes. |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
294 See `custom-theme-set-faces' for more information on the interplay |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
295 between themes and faces. |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
296 See `defface' for the format of SPEC. |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
297 |
17524
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
298 If NOW is present and non-nil, FACE is created now, according to SPEC. |
25684
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
299 COMMENT is a string comment about FACE. |
17334 | 300 |
48950
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
301 Several properties of THEME and FACE are used in the process: |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
302 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
303 If THEME property `theme-immediate' is non-nil, this is equivalent of |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
304 providing the NOW argument to all faces in the argument list: FACE is |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
305 created now. The only difference is FACE property `force-face': if NOW |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
306 is non-nil, FACE property `force-face' is set to the symbol `rogue', else |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
307 if THEME property `theme-immediate' is non-nil, FACE property `force-face' |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
308 is set to the symbol `immediate'. |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
309 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
310 SPEC itself is saved in FACE property `saved-face' and it is stored in |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
311 FACE's list property `theme-face' \(using `custom-push-theme')." |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
312 (custom-check-theme theme) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
313 (let ((immediate (get theme 'theme-immediate))) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
314 (while args |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
315 (let ((entry (car args))) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
316 (if (listp entry) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
317 (let ((face (nth 0 entry)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
318 (spec (nth 1 entry)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
319 (now (nth 2 entry)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
320 (comment (nth 3 entry))) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
321 (put face 'saved-face spec) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
322 (put face 'saved-face-comment comment) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
323 (custom-push-theme 'theme-face face theme 'set spec) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
324 (when (or now immediate) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
325 (put face 'force-face (if now 'rogue 'immediate))) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
326 (when (or now immediate (facep face)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
327 (unless (facep face) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
328 (make-empty-face face)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
329 (put face 'face-comment comment) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
330 (face-spec-set face spec)) |
17334 | 331 (setq args (cdr args))) |
332 ;; Old format, a plist of FACE SPEC pairs. | |
333 (let ((face (nth 0 args)) | |
334 (spec (nth 1 args))) | |
48950
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
335 (put face 'saved-face spec) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
336 (custom-push-theme 'theme-face face theme 'set spec)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
337 (setq args (cdr (cdr args)))))))) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
338 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
339 ;;;###autoload |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
340 (defun custom-theme-face-value (face theme) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
341 "Return spec of FACE in THEME if THEME modifies FACE. |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
342 Value is nil otherwise. The association between theme and spec for FACE |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
343 is stored in FACE's property `theme-face'. The appropriate face |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
344 is retrieved using `custom-theme-value'." |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
345 ;; Returns car because the value is stored inside a one element list |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
346 (car-safe (custom-theme-value theme (get face 'theme-face)))) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
347 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
348 (defun custom-theme-reset-internal-face (face to-theme) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
349 "Reset FACE to the value defined by TO-THEME. |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
350 If FACE is not defined in TO-THEME, reset FACE to the standard |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
351 value. See `custom-theme-face-value'. The standard value is |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
352 stored in SYMBOL's property `face-defface-spec' by `defface'." |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
353 (let ((spec (custom-theme-face-value face to-theme)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
354 was-in-theme) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
355 (setq was-in-theme spec) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
356 (setq spec (or spec (get face 'face-defface-spec))) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
357 (when spec |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
358 (put face 'save-face was-in-theme) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
359 (when (or (get face 'force-face) (facep face)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
360 (unless (facep face) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
361 (make-empty-face face)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
362 (face-spec-set face spec))) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
363 spec)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
364 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
365 ;;;###autoload |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
366 (defun custom-theme-reset-faces (theme &rest args) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
367 "Reset the value of the face to values previously defined. |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
368 Associate this setting with THEME. |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
369 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
370 ARGS is a list of lists of the form |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
371 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
372 (FACE TO-THEME) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
373 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
374 This means reset FACE to its value in TO-THEME." |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
375 (custom-check-theme theme) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
376 (mapcar '(lambda (arg) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
377 (apply 'custom-theme-reset-internal-face arg) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
378 (custom-push-theme 'theme-face (car arg) theme 'reset (cadr arg))) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
379 args)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
380 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
381 ;;;###autoload |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
382 (defun custom-reset-faces (&rest args) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
383 "Reset the value of the face to values previously saved. |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
384 This is the setting assosiated the `user' theme. |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
385 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
386 ARGS is defined as for `custom-theme-reset-faces'" |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
387 (apply 'custom-theme-reset-faces 'user args)) |
17334 | 388 |
389 ;;; The End. | |
390 | |
391 (provide 'cus-face) | |
392 | |
52401 | 393 ;;; arch-tag: 9a5c4b63-0d27-4c92-a5af-f2c7ed764c2b |
25684
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
394 ;;; cus-face.el ends here |