annotate lisp/cus-face.el @ 61633:a76a30ee7c89

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