Mercurial > emacs
annotate lisp/cus-face.el @ 55155:519f44af960a
(desktop-buffer-misc-data-function): Rename to desktop-save-buffer and change docstring.
(desktop-buffer-modes-to-save): Delete.
(desktop-save-buffer-p): Use desktop-save-buffer instead of
desktop-buffer-modes-to-save.
(desktop-save): Rename desktop-buffer-misc-data-function to
desktop-save-buffer and allow non-function value.
(desktop-missing-file-warning): Correct docstring.
author | Lars Hansen <larsh@soem.dk> |
---|---|
date | Mon, 26 Apr 2004 18:57:41 +0000 |
parents | 695cf19ef79e |
children | 16a8650c3814 f5cadabb36dd 375f2633d815 |
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. |
42 (let ((value (or (get face 'saved-face) spec)) | |
17524
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
43 (frames (frame-list)) |
17334 | 44 frame) |
45 ;; Create global face. | |
46 (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
|
47 ;; Create frame-local faces |
17334 | 48 (while frames |
49 (setq frame (car frames) | |
50 frames (cdr frames)) | |
19257
e487ed925a50
(custom-declare-face): Call make-face-x-resource-internal.
Richard M. Stallman <rms@gnu.org>
parents:
18935
diff
changeset
|
51 (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
|
52 ;; 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
|
53 (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
|
54 (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
|
55 ;; 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
|
56 (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
|
57 (when (and doc (null (face-documentation face))) |
26583
3251a6750150
(custom-declare-face): Purecopy DOC.
Dave Love <fx@gnu.org>
parents:
25684
diff
changeset
|
58 (set-face-documentation face (purecopy doc))) |
17334 | 59 (custom-handle-all-keywords face args 'custom-face) |
60 (run-hooks 'custom-define-hook)) | |
61 face) | |
62 | |
24984 | 63 ;;; Face attributes. |
64 | |
17334 | 65 (defconst custom-face-attributes |
24984 | 66 '((:family |
39607
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
67 (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
|
68 :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
|
69 |
24984 | 70 (:width |
71 (choice :tag "Width" | |
72 :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
|
73 :value normal ; default |
24984 | 74 (const :tag "compressed" condensed) |
75 (const :tag "condensed" condensed) | |
76 (const :tag "demiexpanded" semi-expanded) | |
77 (const :tag "expanded" expanded) | |
78 (const :tag "extracondensed" extra-condensed) | |
79 (const :tag "extraexpanded" extra-expanded) | |
80 (const :tag "medium" normal) | |
81 (const :tag "narrow" condensed) | |
82 (const :tag "normal" normal) | |
83 (const :tag "regular" normal) | |
84 (const :tag "semicondensed" semi-condensed) | |
85 (const :tag "semiexpanded" semi-expanded) | |
86 (const :tag "ultracondensed" ultra-condensed) | |
87 (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
|
88 (const :tag "wide" extra-expanded))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
89 |
24984 | 90 (:height |
91 (choice :tag "Height" | |
92 :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
|
93 :value 1.0 ; default |
31192 | 94 (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
|
95 (number :tag "Scale" 1.0))) |
31192 | 96 |
24984 | 97 (:weight |
98 (choice :tag "Weight" | |
99 :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
|
100 :value normal ; default |
44471
b1d6fcf67b85
(custom-face-attributes): Fix typo in `ultra-bold'.
Richard M. Stallman <rms@gnu.org>
parents:
39607
diff
changeset
|
101 (const :tag "black" ultra-bold) |
24984 | 102 (const :tag "bold" bold) |
103 (const :tag "book" semi-light) | |
104 (const :tag "demibold" semi-bold) | |
105 (const :tag "extralight" extra-light) | |
106 (const :tag "extrabold" extra-bold) | |
107 (const :tag "heavy" extra-bold) | |
108 (const :tag "light" light) | |
109 (const :tag "medium" normal) | |
110 (const :tag "normal" normal) | |
111 (const :tag "regular" normal) | |
112 (const :tag "semibold" semi-bold) | |
113 (const :tag "semilight" semi-light) | |
114 (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
|
115 (const :tag "ultrabold" ultra-bold))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
116 |
24984 | 117 (:slant |
118 (choice :tag "Slant" | |
119 :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
|
120 :value normal ; default |
24984 | 121 (const :tag "italic" italic) |
122 (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
|
123 (const :tag "normal" normal))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
124 |
24984 | 125 (:underline |
126 (choice :tag "Underline" | |
127 :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
|
128 (const :tag "Off" nil) |
24984 | 129 (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
|
130 (color :tag "Colored"))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
131 |
24984 | 132 (:overline |
133 (choice :tag "Overline" | |
134 :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
|
135 (const :tag "Off" nil) |
24984 | 136 (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
|
137 (color :tag "Colored"))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
138 |
24984 | 139 (:strike-through |
140 (choice :tag "Strike-through" | |
141 :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
|
142 (const :tag "Off" nil) |
24984 | 143 (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
|
144 (color :tag "Colored"))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
145 |
24984 | 146 (:box |
25684
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
147 ;; Fixme: this can probably be done better. |
24984 | 148 (choice :tag "Box around text" |
149 :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
|
150 (const :tag "Off" nil) |
24984 | 151 (list :tag "Box" |
33936
e66f3c5840a4
(custom-face-attributes): Add post-filter function for :box.
Miles Bader <miles@gnu.org>
parents:
33874
diff
changeset
|
152 :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
|
153 (const :format "" :value :line-width) |
24984 | 154 (integer :tag "Width") |
25684
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
155 (const :format "" :value :color) |
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
156 (choice :tag "Color" (const :tag "*" nil) color) |
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
157 (const :format "" :value :style) |
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
158 (choice :tag "Style" |
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
159 (const :tag "Raised" released-button) |
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
160 (const :tag "Sunken" pressed-button) |
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
161 (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
|
162 ;; 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
|
163 (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
|
164 (and real-value |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
165 (let ((lwidth |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
166 (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
|
167 (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
|
168 (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
|
169 1)) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
170 (color |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
171 (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
|
172 (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
|
173 nil)) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
174 (style |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
175 (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
|
176 (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
|
177 ;; 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
|
178 (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
|
179 (and cus-value |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
180 (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
|
181 (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
|
182 (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
|
183 (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
|
184 lwidth) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
185 ((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
|
186 ;; 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
|
187 color) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
188 (t |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
189 ;; 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
|
190 (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
|
191 (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
|
192 (and style `(:style ,style))))))))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
193 |
24984 | 194 (:inverse-video |
195 (choice :tag "Inverse-video" | |
196 :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
|
197 (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
|
198 (const :tag "On" t))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
199 |
24984 | 200 (:foreground |
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 "Foreground" |
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 foreground color.")) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
203 |
24984 | 204 (:background |
39607
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
205 (color :tag "Background" |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
206 :help-echo "Set background color.")) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
207 |
24984 | 208 (:stipple |
209 (choice :tag "Stipple" | |
33874
2dccf621b517
(custom-face-attributes): Add "None" choice to :stipple.
Miles Bader <miles@gnu.org>
parents:
33844
diff
changeset
|
210 :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
|
211 (const :tag "None" nil) |
33874
2dccf621b517
(custom-face-attributes): Add "None" choice to :stipple.
Miles Bader <miles@gnu.org>
parents:
33844
diff
changeset
|
212 (file :tag "File" |
2dccf621b517
(custom-face-attributes): Add "None" choice to :stipple.
Miles Bader <miles@gnu.org>
parents:
33844
diff
changeset
|
213 :help-echo "Name of bitmap file." |
2dccf621b517
(custom-face-attributes): Add "None" choice to :stipple.
Miles Bader <miles@gnu.org>
parents:
33844
diff
changeset
|
214 :must-match t))) |
31192 | 215 |
216 (:inherit | |
217 (repeat :tag "Inherit" | |
218 :help-echo "List of faces to inherit attributes from." | |
219 (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
|
220 ;; 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
|
221 (lambda (real-value) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
222 (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
|
223 nil) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
224 ((symbolp real-value) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
225 (list real-value)) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
226 (t |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
227 real-value))) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
228 ;; 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
|
229 (lambda (cus-value) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
230 (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
|
231 (car cus-value) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
232 cus-value)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
233 |
24984 | 234 "Alist of face attributes. |
235 | |
33844
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
236 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
|
237 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
|
238 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
|
239 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
|
240 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
|
241 and POST-FILTER are optional. |
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 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
|
244 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
|
245 customization type TYPE). |
17334 | 246 |
33844
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
247 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
|
248 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
|
249 given face attribute.") |
17334 | 250 |
251 (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
|
252 "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
|
253 The list has the form (KEYWORD VALUE KEYWORD VALUE...). |
17334 | 254 Each keyword should be listed in `custom-face-attributes'. |
255 | |
17524
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
256 If FRAME is nil, use the global defaults for FACE." |
24984 | 257 (let ((attrs custom-face-attributes) |
258 plist) | |
259 (while attrs | |
260 (let* ((attribute (car (car attrs))) | |
261 (value (face-attribute face attribute frame))) | |
262 (setq attrs (cdr attrs)) | |
31192 | 263 (unless (or (eq value 'unspecified) |
264 (and (null value) (memq attribute '(:inherit)))) | |
24984 | 265 (setq plist (cons attribute (cons value plist)))))) |
266 plist)) | |
17334 | 267 |
268 ;;; Initializing. | |
269 | |
270 ;;;###autoload | |
271 (defun custom-set-faces (&rest args) | |
272 "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
|
273 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
|
274 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
|
275 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
276 (FACE SPEC [NOW [COMMENT]]) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
277 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
278 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
|
279 `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
|
280 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
|
281 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
|
282 between themes and faces. |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
283 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
|
284 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
285 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
|
286 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
|
287 (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
|
288 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
289 (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
|
290 "Initialize faces for theme THEME. |
17334 | 291 The arguments should be a list where each entry has the form: |
292 | |
25684
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
293 (FACE SPEC [NOW [COMMENT]]) |
17334 | 294 |
48950
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
295 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
|
296 `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
|
297 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
|
298 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
|
299 between themes and faces. |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
300 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
|
301 |
17524
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
302 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
|
303 COMMENT is a string comment about FACE. |
17334 | 304 |
48950
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
305 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
|
306 |
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, this is equivalent of |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
308 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
|
309 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
|
310 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
|
311 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
|
312 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
|
313 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
314 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
|
315 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
|
316 (custom-check-theme theme) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
317 (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
|
318 (while args |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
319 (let ((entry (car args))) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
320 (if (listp entry) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
321 (let ((face (nth 0 entry)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
322 (spec (nth 1 entry)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
323 (now (nth 2 entry)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
324 (comment (nth 3 entry))) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
325 (put face 'saved-face spec) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
326 (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
|
327 (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
|
328 (when (or now immediate) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
329 (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
|
330 (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
|
331 (unless (facep face) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
332 (make-empty-face face)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
333 (put face 'face-comment comment) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
334 (face-spec-set face spec)) |
17334 | 335 (setq args (cdr args))) |
336 ;; Old format, a plist of FACE SPEC pairs. | |
337 (let ((face (nth 0 args)) | |
338 (spec (nth 1 args))) | |
48950
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
339 (put face 'saved-face spec) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
340 (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
|
341 (setq args (cdr (cdr args)))))))) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
342 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
343 ;;;###autoload |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
344 (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
|
345 "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
|
346 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
|
347 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
|
348 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
|
349 ;; 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
|
350 (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
|
351 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
352 (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
|
353 "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
|
354 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
|
355 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
|
356 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
|
357 (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
|
358 was-in-theme) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
359 (setq was-in-theme spec) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
360 (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
|
361 (when spec |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
362 (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
|
363 (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
|
364 (unless (facep face) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
365 (make-empty-face face)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
366 (face-spec-set face spec))) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
367 spec)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
368 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
369 ;;;###autoload |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
370 (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
|
371 "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
|
372 Associate this setting with 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 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
|
375 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
376 (FACE TO-THEME) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
377 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
378 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
|
379 (custom-check-theme theme) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
380 (mapcar '(lambda (arg) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
381 (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
|
382 (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
|
383 args)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
384 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
385 ;;;###autoload |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
386 (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
|
387 "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
|
388 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
|
389 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
390 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
|
391 (apply 'custom-theme-reset-faces 'user args)) |
17334 | 392 |
393 ;;; The End. | |
394 | |
395 (provide 'cus-face) | |
396 | |
52401 | 397 ;;; arch-tag: 9a5c4b63-0d27-4c92-a5af-f2c7ed764c2b |
25684
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
398 ;;; cus-face.el ends here |