Mercurial > emacs
annotate lisp/cus-face.el @ 69536:052139add0ff
(mh-image-load-path-for-library): Minor docstring fix.
author | Bill Wohler <wohler@newt.com> |
---|---|
date | Fri, 17 Mar 2006 17:28:09 +0000 |
parents | 3bd95f4f2941 |
children | e3694f1cb928 b98066f4aa10 c5406394f567 |
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 ;; |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64219
diff
changeset
|
3 ;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, |
68651
3bd95f4f2941
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
67977
diff
changeset
|
4 ;; 2005, 2006 Free Software Foundation, Inc. |
17334 | 5 ;; |
6 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> | |
7 ;; Keywords: help, faces | |
8 | |
17524
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
9 ;; 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
|
10 |
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
11 ;; 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
|
12 ;; 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
|
13 ;; 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
|
14 ;; any later version. |
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
15 |
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
16 ;; 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
|
17 ;; 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
|
18 ;; 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
|
19 ;; 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
|
20 |
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
21 ;; 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
|
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64091 | 23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
24 ;; Boston, MA 02110-1301, USA. | |
17524
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
25 |
17334 | 26 ;;; Commentary: |
27 ;; | |
28 ;; See `custom.el'. | |
29 | |
30 ;;; Code: | |
31 | |
24984 | 32 (defalias 'custom-facep 'facep) |
17856
1e5f1a1f0db3
(custom-facep): Defined (once again).
Richard M. Stallman <rms@gnu.org>
parents:
17568
diff
changeset
|
33 |
17334 | 34 ;;; Declaring a face. |
35 | |
36 ;;;###autoload | |
37 (defun custom-declare-face (face spec doc &rest args) | |
38 "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
|
39 (unless (get face 'face-defface-spec) |
17334 | 40 (when (fboundp 'facep) |
17524
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
41 (unless (facep face) |
17334 | 42 ;; 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
|
43 (let ((value (or (get face 'saved-face) spec))) |
17334 | 44 ;; Create global face. |
45 (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
|
46 ;; Create frame-local faces |
56079
16a8650c3814
(custom-declare-face): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
47 (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
|
48 (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
|
49 ;; When making a face after frames already exist |
66273
03fbd1b84b2f
(custom-declare-face): Make face from X resources also on Mac.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64762
diff
changeset
|
50 (if (memq window-system '(x w32 mac)) |
19257
e487ed925a50
(custom-declare-face): Call make-face-x-resource-internal.
Richard M. Stallman <rms@gnu.org>
parents:
18935
diff
changeset
|
51 (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
|
52 ;; 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
|
53 (put face 'face-defface-spec spec) |
59369
7c06e308c354
(custom-declare-face): Record defface in current-load-list.
Richard M. Stallman <rms@gnu.org>
parents:
59278
diff
changeset
|
54 (push (cons 'defface face) current-load-list) |
18935
ab4cd3135797
(custom-declare-face): Use [set-]face-documentation.
Richard M. Stallman <rms@gnu.org>
parents:
18599
diff
changeset
|
55 (when (and doc (null (face-documentation face))) |
26583
3251a6750150
(custom-declare-face): Purecopy DOC.
Dave Love <fx@gnu.org>
parents:
25684
diff
changeset
|
56 (set-face-documentation face (purecopy doc))) |
17334 | 57 (custom-handle-all-keywords face args 'custom-face) |
58 (run-hooks 'custom-define-hook)) | |
59 face) | |
60 | |
24984 | 61 ;;; Face attributes. |
62 | |
63765
d30261824cd5
(custom-face-attributes): Add autoload.
Richard M. Stallman <rms@gnu.org>
parents:
59369
diff
changeset
|
63 ;;;###autoload |
17334 | 64 (defconst custom-face-attributes |
24984 | 65 '((:family |
39607
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
66 (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
|
67 :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
|
68 |
24984 | 69 (:width |
70 (choice :tag "Width" | |
71 :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
|
72 :value normal ; default |
24984 | 73 (const :tag "compressed" condensed) |
74 (const :tag "condensed" condensed) | |
75 (const :tag "demiexpanded" semi-expanded) | |
76 (const :tag "expanded" expanded) | |
77 (const :tag "extracondensed" extra-condensed) | |
78 (const :tag "extraexpanded" extra-expanded) | |
79 (const :tag "medium" normal) | |
80 (const :tag "narrow" condensed) | |
81 (const :tag "normal" normal) | |
82 (const :tag "regular" normal) | |
83 (const :tag "semicondensed" semi-condensed) | |
84 (const :tag "semiexpanded" semi-expanded) | |
85 (const :tag "ultracondensed" ultra-condensed) | |
86 (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
|
87 (const :tag "wide" extra-expanded))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
88 |
24984 | 89 (:height |
90 (choice :tag "Height" | |
91 :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
|
92 :value 1.0 ; default |
31192 | 93 (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
|
94 (number :tag "Scale" 1.0))) |
31192 | 95 |
24984 | 96 (:weight |
97 (choice :tag "Weight" | |
98 :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
|
99 :value normal ; default |
44471
b1d6fcf67b85
(custom-face-attributes): Fix typo in `ultra-bold'.
Richard M. Stallman <rms@gnu.org>
parents:
39607
diff
changeset
|
100 (const :tag "black" ultra-bold) |
24984 | 101 (const :tag "bold" bold) |
102 (const :tag "book" semi-light) | |
103 (const :tag "demibold" semi-bold) | |
104 (const :tag "extralight" extra-light) | |
105 (const :tag "extrabold" extra-bold) | |
106 (const :tag "heavy" extra-bold) | |
107 (const :tag "light" light) | |
108 (const :tag "medium" normal) | |
109 (const :tag "normal" normal) | |
110 (const :tag "regular" normal) | |
111 (const :tag "semibold" semi-bold) | |
112 (const :tag "semilight" semi-light) | |
113 (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
|
114 (const :tag "ultrabold" ultra-bold))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
115 |
24984 | 116 (:slant |
117 (choice :tag "Slant" | |
118 :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
|
119 :value normal ; default |
24984 | 120 (const :tag "italic" italic) |
121 (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
|
122 (const :tag "normal" normal))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
123 |
24984 | 124 (:underline |
125 (choice :tag "Underline" | |
126 :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
|
127 (const :tag "Off" nil) |
24984 | 128 (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
|
129 (color :tag "Colored"))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
130 |
24984 | 131 (:overline |
132 (choice :tag "Overline" | |
133 :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
|
134 (const :tag "Off" nil) |
24984 | 135 (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
|
136 (color :tag "Colored"))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
137 |
24984 | 138 (:strike-through |
139 (choice :tag "Strike-through" | |
140 :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
|
141 (const :tag "Off" nil) |
24984 | 142 (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
|
143 (color :tag "Colored"))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
144 |
24984 | 145 (:box |
25684
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
146 ;; Fixme: this can probably be done better. |
24984 | 147 (choice :tag "Box around text" |
148 :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
|
149 (const :tag "Off" nil) |
24984 | 150 (list :tag "Box" |
33936
e66f3c5840a4
(custom-face-attributes): Add post-filter function for :box.
Miles Bader <miles@gnu.org>
parents:
33874
diff
changeset
|
151 :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
|
152 (const :format "" :value :line-width) |
24984 | 153 (integer :tag "Width") |
25684
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
154 (const :format "" :value :color) |
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
155 (choice :tag "Color" (const :tag "*" nil) color) |
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
156 (const :format "" :value :style) |
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
157 (choice :tag "Style" |
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
158 (const :tag "Raised" released-button) |
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
159 (const :tag "Sunken" pressed-button) |
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
160 (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
|
161 ;; 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
|
162 (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
|
163 (and real-value |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
164 (let ((lwidth |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
165 (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
|
166 (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
|
167 (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
|
168 1)) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
169 (color |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
170 (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
|
171 (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
|
172 nil)) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
173 (style |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
174 (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
|
175 (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
|
176 ;; 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
|
177 (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
|
178 (and cus-value |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
179 (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
|
180 (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
|
181 (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
|
182 (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
|
183 lwidth) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
184 ((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
|
185 ;; 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
|
186 color) |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
187 (t |
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
188 ;; 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
|
189 (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
|
190 (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
|
191 (and style `(:style ,style))))))))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
192 |
24984 | 193 (:inverse-video |
194 (choice :tag "Inverse-video" | |
195 :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
|
196 (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
|
197 (const :tag "On" t))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
198 |
24984 | 199 (:foreground |
39607
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
200 (color :tag "Foreground" |
59278
da0a523ffb17
(custom-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
56079
diff
changeset
|
201 :help-echo "Set foreground color (name or #RRGGBB hex spec).")) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
202 |
24984 | 203 (:background |
39607
dc8769075676
(custom-face-attributes): Make sure each attribute has a valid default
Miles Bader <miles@gnu.org>
parents:
38436
diff
changeset
|
204 (color :tag "Background" |
59278
da0a523ffb17
(custom-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
56079
diff
changeset
|
205 :help-echo "Set background color (name or #RRGGBB hex spec).")) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
206 |
24984 | 207 (:stipple |
208 (choice :tag "Stipple" | |
33874
2dccf621b517
(custom-face-attributes): Add "None" choice to :stipple.
Miles Bader <miles@gnu.org>
parents:
33844
diff
changeset
|
209 :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
|
210 (const :tag "None" nil) |
33874
2dccf621b517
(custom-face-attributes): Add "None" choice to :stipple.
Miles Bader <miles@gnu.org>
parents:
33844
diff
changeset
|
211 (file :tag "File" |
2dccf621b517
(custom-face-attributes): Add "None" choice to :stipple.
Miles Bader <miles@gnu.org>
parents:
33844
diff
changeset
|
212 :help-echo "Name of bitmap file." |
2dccf621b517
(custom-face-attributes): Add "None" choice to :stipple.
Miles Bader <miles@gnu.org>
parents:
33844
diff
changeset
|
213 :must-match t))) |
31192 | 214 |
215 (:inherit | |
216 (repeat :tag "Inherit" | |
217 :help-echo "List of faces to inherit attributes from." | |
218 (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
|
219 ;; 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
|
220 (lambda (real-value) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
221 (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
|
222 nil) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
223 ((symbolp real-value) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
224 (list real-value)) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
225 (t |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
226 real-value))) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
227 ;; 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
|
228 (lambda (cus-value) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
229 (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
|
230 (car cus-value) |
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
231 cus-value)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48950
diff
changeset
|
232 |
24984 | 233 "Alist of face attributes. |
234 | |
33844
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
235 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
|
236 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
|
237 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
|
238 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
|
239 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
|
240 and POST-FILTER are optional. |
17334 | 241 |
33844
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
242 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
|
243 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
|
244 customization type TYPE). |
17334 | 245 |
33844
1ae73b01ef27
(custom-face-attributes): Remove SET and GET functions. Add some
Miles Bader <miles@gnu.org>
parents:
31192
diff
changeset
|
246 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
|
247 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
|
248 given face attribute.") |
17334 | 249 |
250 (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
|
251 "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
|
252 The list has the form (KEYWORD VALUE KEYWORD VALUE...). |
17334 | 253 Each keyword should be listed in `custom-face-attributes'. |
254 | |
17524
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
255 If FRAME is nil, use the global defaults for FACE." |
24984 | 256 (let ((attrs custom-face-attributes) |
257 plist) | |
258 (while attrs | |
259 (let* ((attribute (car (car attrs))) | |
260 (value (face-attribute face attribute frame))) | |
261 (setq attrs (cdr attrs)) | |
31192 | 262 (unless (or (eq value 'unspecified) |
263 (and (null value) (memq attribute '(:inherit)))) | |
24984 | 264 (setq plist (cons attribute (cons value plist)))))) |
265 plist)) | |
17334 | 266 |
267 ;;; Initializing. | |
268 | |
269 ;;;###autoload | |
270 (defun custom-set-faces (&rest args) | |
271 "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
|
272 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
|
273 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
|
274 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
275 (FACE SPEC [NOW [COMMENT]]) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
276 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
277 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
|
278 `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
|
279 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
|
280 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
|
281 between themes and faces. |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
282 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
|
283 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
284 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
|
285 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
|
286 (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
|
287 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
288 (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
|
289 "Initialize faces for theme THEME. |
17334 | 290 The arguments should be a list where each entry has the form: |
291 | |
25684
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
292 (FACE SPEC [NOW [COMMENT]]) |
17334 | 293 |
48950
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
294 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
|
295 `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
|
296 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
|
297 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
|
298 between themes and faces. |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
299 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
|
300 |
17524
8ba505704d9d
Major simplification; most of file contents deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17415
diff
changeset
|
301 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
|
302 COMMENT is a string comment about FACE. |
17334 | 303 |
48950
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
304 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
|
305 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
306 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
|
307 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
|
308 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
|
309 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
|
310 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
|
311 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
|
312 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
313 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
|
314 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
|
315 (custom-check-theme theme) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
316 (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
|
317 (while args |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
318 (let ((entry (car args))) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
319 (if (listp entry) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
320 (let ((face (nth 0 entry)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
321 (spec (nth 1 entry)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
322 (now (nth 2 entry)) |
67123
6e41569f62c8
* custom.el (enable-theme): Signal error if argument is not a
Chong Yidong <cyd@stupidchicken.com>
parents:
66273
diff
changeset
|
323 (comment (nth 3 entry)) |
6e41569f62c8
* custom.el (enable-theme): Signal error if argument is not a
Chong Yidong <cyd@stupidchicken.com>
parents:
66273
diff
changeset
|
324 oldspec) |
63997
3314a44dacf7
(custom-theme-set-faces): Make it handle face aliases whose alias
Luc Teirlinck <teirllm@auburn.edu>
parents:
63765
diff
changeset
|
325 ;; If FACE is actually an alias, customize the face it |
3314a44dacf7
(custom-theme-set-faces): Make it handle face aliases whose alias
Luc Teirlinck <teirllm@auburn.edu>
parents:
63765
diff
changeset
|
326 ;; is aliased to. |
3314a44dacf7
(custom-theme-set-faces): Make it handle face aliases whose alias
Luc Teirlinck <teirllm@auburn.edu>
parents:
63765
diff
changeset
|
327 (if (get face 'face-alias) |
3314a44dacf7
(custom-theme-set-faces): Make it handle face aliases whose alias
Luc Teirlinck <teirllm@auburn.edu>
parents:
63765
diff
changeset
|
328 (setq face (get face 'face-alias))) |
67123
6e41569f62c8
* custom.el (enable-theme): Signal error if argument is not a
Chong Yidong <cyd@stupidchicken.com>
parents:
66273
diff
changeset
|
329 |
6e41569f62c8
* custom.el (enable-theme): Signal error if argument is not a
Chong Yidong <cyd@stupidchicken.com>
parents:
66273
diff
changeset
|
330 (setq oldspec (get face 'theme-face)) |
6e41569f62c8
* custom.el (enable-theme): Signal error if argument is not a
Chong Yidong <cyd@stupidchicken.com>
parents:
66273
diff
changeset
|
331 (when (not (and oldspec (eq 'user (caar oldspec)))) |
6e41569f62c8
* custom.el (enable-theme): Signal error if argument is not a
Chong Yidong <cyd@stupidchicken.com>
parents:
66273
diff
changeset
|
332 (put face 'saved-face spec) |
6e41569f62c8
* custom.el (enable-theme): Signal error if argument is not a
Chong Yidong <cyd@stupidchicken.com>
parents:
66273
diff
changeset
|
333 (put face 'saved-face-comment comment)) |
6e41569f62c8
* custom.el (enable-theme): Signal error if argument is not a
Chong Yidong <cyd@stupidchicken.com>
parents:
66273
diff
changeset
|
334 |
48950
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
335 (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
|
336 (when (or now immediate) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
337 (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
|
338 (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
|
339 (unless (facep face) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
340 (make-empty-face face)) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
341 (put face 'face-comment comment) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
342 (face-spec-set face spec)) |
17334 | 343 (setq args (cdr args))) |
344 ;; Old format, a plist of FACE SPEC pairs. | |
345 (let ((face (nth 0 args)) | |
346 (spec (nth 1 args))) | |
63997
3314a44dacf7
(custom-theme-set-faces): Make it handle face aliases whose alias
Luc Teirlinck <teirllm@auburn.edu>
parents:
63765
diff
changeset
|
347 (if (get face 'face-alias) |
3314a44dacf7
(custom-theme-set-faces): Make it handle face aliases whose alias
Luc Teirlinck <teirllm@auburn.edu>
parents:
63765
diff
changeset
|
348 (setq face (get face 'face-alias))) |
48950
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
349 (put face 'saved-face spec) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
350 (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
|
351 (setq args (cdr (cdr args)))))))) |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
352 |
67977
03ee9bccbfeb
* custom.el: Move Custom Themes commentary to start of theme code.
Chong Yidong <cyd@stupidchicken.com>
parents:
67123
diff
changeset
|
353 ;; XEmacs compability function. In XEmacs, when you reset a Custom |
03ee9bccbfeb
* custom.el: Move Custom Themes commentary to start of theme code.
Chong Yidong <cyd@stupidchicken.com>
parents:
67123
diff
changeset
|
354 ;; Theme, you have to specify the theme to reset it to. We just apply |
03ee9bccbfeb
* custom.el: Move Custom Themes commentary to start of theme code.
Chong Yidong <cyd@stupidchicken.com>
parents:
67123
diff
changeset
|
355 ;; the next theme. |
48950
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
356 ;;;###autoload |
64219
cd5dc4349fb2
(custom-theme-set-faces): Make it work.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
357 (defun custom-theme-reset-faces (theme &rest args) |
cd5dc4349fb2
(custom-theme-set-faces): Make it work.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
358 "Reset the specs in THEME of some faces to their specs in other themes. |
cd5dc4349fb2
(custom-theme-set-faces): Make it work.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
359 Each of the arguments ARGS has this form: |
48950
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
360 |
67977
03ee9bccbfeb
* custom.el: Move Custom Themes commentary to start of theme code.
Chong Yidong <cyd@stupidchicken.com>
parents:
67123
diff
changeset
|
361 (FACE IGNORED) |
48950
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
362 |
67977
03ee9bccbfeb
* custom.el: Move Custom Themes commentary to start of theme code.
Chong Yidong <cyd@stupidchicken.com>
parents:
67123
diff
changeset
|
363 This means reset FACE. The argument IGNORED is ignored." |
48950
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
364 (custom-check-theme theme) |
64219
cd5dc4349fb2
(custom-theme-set-faces): Make it work.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
365 (dolist (arg args) |
67977
03ee9bccbfeb
* custom.el: Move Custom Themes commentary to start of theme code.
Chong Yidong <cyd@stupidchicken.com>
parents:
67123
diff
changeset
|
366 (custom-push-theme 'theme-face (car arg) theme 'reset))) |
48950
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
367 |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
368 ;;;###autoload |
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
369 (defun custom-reset-faces (&rest args) |
64219
cd5dc4349fb2
(custom-theme-set-faces): Make it work.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
370 "Reset the specs of some faces to their specs in specified themes. |
cd5dc4349fb2
(custom-theme-set-faces): Make it work.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
371 This creates settings in the `user' theme. |
48950
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
372 |
64219
cd5dc4349fb2
(custom-theme-set-faces): Make it work.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
373 Each of the arguments ARGS has this form: |
cd5dc4349fb2
(custom-theme-set-faces): Make it work.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
374 |
cd5dc4349fb2
(custom-theme-set-faces): Make it work.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
375 (FACE FROM-THEME) |
cd5dc4349fb2
(custom-theme-set-faces): Make it work.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
376 |
cd5dc4349fb2
(custom-theme-set-faces): Make it work.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
377 This means reset FACE to its value in FROM-THEME." |
48950
8ccf8576bbc1
(custom-set-faces): Call custom-theme-set-faces.
Richard M. Stallman <rms@gnu.org>
parents:
48521
diff
changeset
|
378 (apply 'custom-theme-reset-faces 'user args)) |
17334 | 379 |
380 ;;; The End. | |
381 | |
382 (provide 'cus-face) | |
383 | |
52401 | 384 ;;; arch-tag: 9a5c4b63-0d27-4c92-a5af-f2c7ed764c2b |
25684
e3ed0e86532c
(custom-face-attributes): Simplify :underline, :overline,
Dave Love <fx@gnu.org>
parents:
24984
diff
changeset
|
385 ;;; cus-face.el ends here |