Mercurial > emacs
annotate lisp/faces.el @ 19318:42c1854d17fb
(X_DEFAULT_SEARCH_PATH): Add /usr/X11R6/lib alternatives.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Tue, 12 Aug 1997 16:11:03 +0000 |
parents | 24bfe6095dfe |
children | 11d21b4613cd |
rev | line source |
---|---|
2456 | 1 ;;; faces.el --- Lisp interface to the c "face" structure |
2 | |
14169 | 3 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. |
2456 | 4 |
5 ;; This file is part of GNU Emacs. | |
6 | |
7 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
8 ;; it under the terms of the GNU General Public License as published by | |
9 ;; the Free Software Foundation; either version 2, or (at your option) | |
10 ;; any later version. | |
11 | |
12 ;; GNU Emacs is distributed in the hope that it will be useful, | |
13 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 ;; GNU General Public License for more details. | |
16 | |
17 ;; You should have received a copy of the GNU General Public License | |
14169 | 18 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
19 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
20 ;; Boston, MA 02111-1307, USA. | |
2456 | 21 |
22 ;;; Commentary: | |
23 | |
24 ;; Mostly derived from Lucid. | |
25 | |
26 ;;; Code: | |
27 | |
10107
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
28 (eval-when-compile |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
29 ;; These used to be defsubsts, now they're subrs. Avoid losing if we're |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
30 ;; being compiled with an old Emacs that still has defsubrs in it. |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
31 (put 'face-name 'byte-optimizer nil) |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
32 (put 'face-id 'byte-optimizer nil) |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
33 (put 'face-font 'byte-optimizer nil) |
18890
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
34 (put 'face-font-explicit 'byte-optimizer nil) |
10107
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
35 (put 'face-foreground 'byte-optimizer nil) |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
36 (put 'face-background 'byte-optimizer nil) |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
37 (put 'face-stipple 'byte-optimizer nil) |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
38 (put 'face-underline-p 'byte-optimizer nil) |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
39 (put 'set-face-font 'byte-optimizer nil) |
18890
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
40 (put 'set-face-font-auto 'byte-optimizer nil) |
10107
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
41 (put 'set-face-foreground 'byte-optimizer nil) |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
42 (put 'set-face-background 'byte-optimizer nil) |
11850
f9174d73e755
Put property on set-face-stipple, not set-stipple.
Karl Heuer <kwzh@gnu.org>
parents:
11464
diff
changeset
|
43 (put 'set-face-stipple 'byte-optimizer nil) |
10107
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
44 (put 'set-face-underline-p 'byte-optimizer nil)) |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
45 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
46 ;;;; Functions for manipulating face vectors. |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
47 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
48 ;;; A face vector is a vector of the form: |
17945
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
49 ;;; [face NAME ID FONT FOREGROUND BACKGROUND STIPPLE UNDERLINE INVERSE] |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
50 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
51 ;;; Type checkers. |
2456 | 52 (defsubst internal-facep (x) |
18890
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
53 (and (vectorp x) (= (length x) 10) (eq (aref x 0) 'face))) |
2456 | 54 |
10584 | 55 (defun facep (x) |
56 "Return t if X is a face name or an internal face vector." | |
57 (and (or (internal-facep x) | |
58 (and (symbolp x) (assq x global-face-data))) | |
59 t)) | |
60 | |
2456 | 61 (defmacro internal-check-face (face) |
10584 | 62 (` (or (internal-facep (, face)) |
63 (signal 'wrong-type-argument (list 'internal-facep (, face)))))) | |
2456 | 64 |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
65 ;;; Accessors. |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
66 (defun face-name (face) |
2456 | 67 "Return the name of face FACE." |
68 (aref (internal-get-face face) 1)) | |
69 | |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
70 (defun face-id (face) |
2456 | 71 "Return the internal ID number of face FACE." |
72 (aref (internal-get-face face) 2)) | |
73 | |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
74 (defun face-font (face &optional frame) |
2456 | 75 "Return the font name of face FACE, or nil if it is unspecified. |
76 If the optional argument FRAME is given, report on face FACE in that frame. | |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
77 If FRAME is t, report on the defaults for face FACE (for new frames). |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
78 The font default for a face is either nil, or a list |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
79 of the form (bold), (italic) or (bold italic). |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
80 If FRAME is omitted or nil, use the selected frame." |
2456 | 81 (aref (internal-get-face face frame) 3)) |
82 | |
18890
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
83 (defun face-font-explicit (face &optional frame) |
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
84 "Return non-nil if this face's font was explicitly specified." |
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
85 (aref (internal-get-face face frame) 9)) |
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
86 |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
87 (defun face-foreground (face &optional frame) |
2456 | 88 "Return the foreground color name of face FACE, or nil if unspecified. |
89 If the optional argument FRAME is given, report on face FACE in that frame. | |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
90 If FRAME is t, report on the defaults for face FACE (for new frames). |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
91 If FRAME is omitted or nil, use the selected frame." |
2456 | 92 (aref (internal-get-face face frame) 4)) |
93 | |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
94 (defun face-background (face &optional frame) |
2456 | 95 "Return the background color name of face FACE, or nil if unspecified. |
96 If the optional argument FRAME is given, report on face FACE in that frame. | |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
97 If FRAME is t, report on the defaults for face FACE (for new frames). |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
98 If FRAME is omitted or nil, use the selected frame." |
2456 | 99 (aref (internal-get-face face frame) 5)) |
100 | |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
101 (defun face-stipple (face &optional frame) |
9569
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
102 "Return the stipple pixmap name of face FACE, or nil if unspecified. |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
103 If the optional argument FRAME is given, report on face FACE in that frame. |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
104 If FRAME is t, report on the defaults for face FACE (for new frames). |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
105 If FRAME is omitted or nil, use the selected frame." |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
106 (aref (internal-get-face face frame) 6)) |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
107 |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
108 (defalias 'face-background-pixmap 'face-stipple) |
2456 | 109 |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
110 (defun face-underline-p (face &optional frame) |
2456 | 111 "Return t if face FACE is underlined. |
112 If the optional argument FRAME is given, report on face FACE in that frame. | |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
113 If FRAME is t, report on the defaults for face FACE (for new frames). |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
114 If FRAME is omitted or nil, use the selected frame." |
2456 | 115 (aref (internal-get-face face frame) 7)) |
116 | |
17945
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
117 (defun face-inverse-video-p (face &optional frame) |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
118 "Return t if face FACE is in inverse video. |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
119 If the optional argument FRAME is given, report on face FACE in that frame. |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
120 If FRAME is t, report on the defaults for face FACE (for new frames). |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
121 If FRAME is omitted or nil, use the selected frame." |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
122 (aref (internal-get-face face frame) 8)) |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
123 |
17522
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
124 (defun face-bold-p (face &optional frame) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
125 "Return non-nil if the font of FACE is bold. |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
126 If the optional argument FRAME is given, report on face FACE in that frame. |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
127 If FRAME is t, report on the defaults for face FACE (for new frames). |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
128 The font default for a face is either nil, or a list |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
129 of the form (bold), (italic) or (bold italic). |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
130 If FRAME is omitted or nil, use the selected frame." |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
131 (let ((font (face-font face frame))) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
132 (if (stringp font) |
18635
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
133 (not (equal font (x-make-font-unbold font))) |
17522
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
134 (memq 'bold font)))) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
135 |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
136 (defun face-italic-p (face &optional frame) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
137 "Return non-nil if the font of FACE is italic. |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
138 If the optional argument FRAME is given, report on face FACE in that frame. |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
139 If FRAME is t, report on the defaults for face FACE (for new frames). |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
140 The font default for a face is either nil, or a list |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
141 of the form (bold), (italic) or (bold italic). |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
142 If FRAME is omitted or nil, use the selected frame." |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
143 (let ((font (face-font face frame))) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
144 (if (stringp font) |
18635
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
145 (not (equal font (x-make-font-unitalic font))) |
17522
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
146 (memq 'italic font)))) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
147 |
18936
5aa5fcdc25c1
(face-documentation): Renamed from face-doc-string.
Richard M. Stallman <rms@gnu.org>
parents:
18919
diff
changeset
|
148 (defalias 'face-doc-string 'face-documentation) |
5aa5fcdc25c1
(face-documentation): Renamed from face-doc-string.
Richard M. Stallman <rms@gnu.org>
parents:
18919
diff
changeset
|
149 (defun face-documentation (face) |
17522
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
150 "Get the documentation string for FACE." |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
151 (get face 'face-documentation)) |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
152 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
153 ;;; Mutators. |
2456 | 154 |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
155 (defun set-face-font (face font &optional frame) |
2456 | 156 "Change the font of face FACE to FONT (a string). |
157 If the optional FRAME argument is provided, change only | |
158 in that frame; otherwise change each frame." | |
159 (interactive (internal-face-interactive "font")) | |
17173
84aa6682810b
(set-face-font): Allow specifing fontset for the arg FONT.
Kenichi Handa <handa@m17n.org>
parents:
17162
diff
changeset
|
160 (if (stringp font) |
84aa6682810b
(set-face-font): Allow specifing fontset for the arg FONT.
Kenichi Handa <handa@m17n.org>
parents:
17162
diff
changeset
|
161 (setq font (or (query-fontset font) |
84aa6682810b
(set-face-font): Allow specifing fontset for the arg FONT.
Kenichi Handa <handa@m17n.org>
parents:
17162
diff
changeset
|
162 (x-resolve-font-name font 'default frame)))) |
18890
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
163 (internal-set-face-1 face 'font font 3 frame) |
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
164 ;; Record that this face's font was set explicitly, not automatically, |
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
165 ;; unless we are setting it to nil. |
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
166 (internal-set-face-1 face nil (not (null font)) 9 frame)) |
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
167 |
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
168 (defun set-face-font-auto (face font &optional frame) |
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
169 "Change the font of face FACE to FONT (a string), for an automatic change. |
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
170 An automatic change means that we don't change the \"explicit\" flag; |
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
171 if the font was derived from the frame font before, it is now. |
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
172 If the optional FRAME argument is provided, change only |
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
173 in that frame; otherwise change each frame." |
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
174 (interactive (internal-face-interactive "font")) |
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
175 (if (stringp font) |
19050
c11b9b44e233
(set-face-font-auto): Create a fontset if FONT is a
Kenichi Handa <handa@m17n.org>
parents:
18936
diff
changeset
|
176 (setq font (or (and (fontset-name-p font) |
c11b9b44e233
(set-face-font-auto): Create a fontset if FONT is a
Kenichi Handa <handa@m17n.org>
parents:
18936
diff
changeset
|
177 (or (query-fontset font) |
c11b9b44e233
(set-face-font-auto): Create a fontset if FONT is a
Kenichi Handa <handa@m17n.org>
parents:
18936
diff
changeset
|
178 (instanciate-fontset font))) |
18890
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
179 (x-resolve-font-name font 'default frame)))) |
3130
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
180 (internal-set-face-1 face 'font font 3 frame)) |
2456 | 181 |
18890
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
182 (defun set-face-font-explicit (face flag &optional frame) |
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
183 "Set the explicit-font flag of face FACE to FLAG. |
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
184 If the optional FRAME argument is provided, change only |
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
185 in that frame; otherwise change each frame." |
18919
fd6c9bd9ca6b
(set-face-font-explicit): Call internal-set-face-1 properly.
Richard M. Stallman <rms@gnu.org>
parents:
18890
diff
changeset
|
186 (internal-set-face-1 face nil flag 9 frame)) |
18890
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
187 |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
188 (defun set-face-foreground (face color &optional frame) |
2456 | 189 "Change the foreground color of face FACE to COLOR (a string). |
190 If the optional FRAME argument is provided, change only | |
191 in that frame; otherwise change each frame." | |
19125
8aad7cef6fc0
(internal-face-interactive): Handle default in usual way,
Richard M. Stallman <rms@gnu.org>
parents:
19114
diff
changeset
|
192 (interactive (internal-face-interactive "foreground" 'color)) |
2715
9caee9338229
* faces.el: Call internal-set-face-1, not internat-set-face-1.
Jim Blandy <jimb@redhat.com>
parents:
2714
diff
changeset
|
193 (internal-set-face-1 face 'foreground color 4 frame)) |
2456 | 194 |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
195 (defvar face-default-stipple "gray3" |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
196 "Default stipple pattern used on monochrome displays. |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
197 This stipple pattern is used on monochrome displays |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
198 instead of shades of gray for a face background color. |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
199 See `set-face-stipple' for possible values for this variable.") |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
200 |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
201 (defun face-color-gray-p (color &optional frame) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
202 "Return t if COLOR is a shade of gray (or white or black). |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
203 FRAME specifies the frame and thus the display for interpreting COLOR." |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
204 (let* ((values (x-color-values color frame)) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
205 (r (nth 0 values)) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
206 (g (nth 1 values)) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
207 (b (nth 2 values))) |
14409
11a297676bda
(face-color-gray-p): Return nil if x-color-values does.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
208 (and values |
11a297676bda
(face-color-gray-p): Return nil if x-color-values does.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
209 (< (abs (- r g)) (/ (max 1 (abs r) (abs g)) 20)) |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
210 (< (abs (- g b)) (/ (max 1 (abs g) (abs b)) 20)) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
211 (< (abs (- b r)) (/ (max 1 (abs b) (abs r)) 20))))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
212 |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
213 (defun set-face-background (face color &optional frame) |
2456 | 214 "Change the background color of face FACE to COLOR (a string). |
215 If the optional FRAME argument is provided, change only | |
216 in that frame; otherwise change each frame." | |
19125
8aad7cef6fc0
(internal-face-interactive): Handle default in usual way,
Richard M. Stallman <rms@gnu.org>
parents:
19114
diff
changeset
|
217 (interactive (internal-face-interactive "background" 'color)) |
9665
36bdda3a1dc9
(set-face-background): Set either stipple or color,
Richard M. Stallman <rms@gnu.org>
parents:
9661
diff
changeset
|
218 ;; For a specific frame, use gray stipple instead of gray color |
36bdda3a1dc9
(set-face-background): Set either stipple or color,
Richard M. Stallman <rms@gnu.org>
parents:
9661
diff
changeset
|
219 ;; if the display does not support a gray color. |
12725
968d38f57f3a
(set-face-background): Don't treat nil as a color.
Richard M. Stallman <rms@gnu.org>
parents:
12690
diff
changeset
|
220 (if (and frame (not (eq frame t)) color |
14040 | 221 ;; Check for support for foreground, not for background! |
12776
d69a2d6d1ae9
(set-face-background): When using face-color-supported-p,
Richard M. Stallman <rms@gnu.org>
parents:
12725
diff
changeset
|
222 ;; face-color-supported-p is smart enough to know |
d69a2d6d1ae9
(set-face-background): When using face-color-supported-p,
Richard M. Stallman <rms@gnu.org>
parents:
12725
diff
changeset
|
223 ;; that grays are "supported" as background |
d69a2d6d1ae9
(set-face-background): When using face-color-supported-p,
Richard M. Stallman <rms@gnu.org>
parents:
12725
diff
changeset
|
224 ;; because we are supposed to use stipple for them! |
d69a2d6d1ae9
(set-face-background): When using face-color-supported-p,
Richard M. Stallman <rms@gnu.org>
parents:
12725
diff
changeset
|
225 (not (face-color-supported-p frame color nil))) |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
226 (set-face-stipple face face-default-stipple frame) |
11464
4921121fbdc0
(set-face-background): Handle FRAME = nil directly
Richard M. Stallman <rms@gnu.org>
parents:
11234
diff
changeset
|
227 (if (null frame) |
4921121fbdc0
(set-face-background): Handle FRAME = nil directly
Richard M. Stallman <rms@gnu.org>
parents:
11234
diff
changeset
|
228 (let ((frames (frame-list))) |
4921121fbdc0
(set-face-background): Handle FRAME = nil directly
Richard M. Stallman <rms@gnu.org>
parents:
11234
diff
changeset
|
229 (while frames |
4921121fbdc0
(set-face-background): Handle FRAME = nil directly
Richard M. Stallman <rms@gnu.org>
parents:
11234
diff
changeset
|
230 (set-face-background (face-name face) color (car frames)) |
4921121fbdc0
(set-face-background): Handle FRAME = nil directly
Richard M. Stallman <rms@gnu.org>
parents:
11234
diff
changeset
|
231 (setq frames (cdr frames))) |
4921121fbdc0
(set-face-background): Handle FRAME = nil directly
Richard M. Stallman <rms@gnu.org>
parents:
11234
diff
changeset
|
232 (set-face-background face color t) |
4921121fbdc0
(set-face-background): Handle FRAME = nil directly
Richard M. Stallman <rms@gnu.org>
parents:
11234
diff
changeset
|
233 color) |
4921121fbdc0
(set-face-background): Handle FRAME = nil directly
Richard M. Stallman <rms@gnu.org>
parents:
11234
diff
changeset
|
234 (internal-set-face-1 face 'background color 5 frame)))) |
2456 | 235 |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
236 (defun set-face-stipple (face pixmap &optional frame) |
9569
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
237 "Change the stipple pixmap of face FACE to PIXMAP. |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
238 PIXMAP should be a string, the name of a file of pixmap data. |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
239 The directories listed in the `x-bitmap-file-path' variable are searched. |
2456 | 240 |
9569
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
241 Alternatively, PIXMAP may be a list of the form (WIDTH HEIGHT DATA) |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
242 where WIDTH and HEIGHT are the size in pixels, |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
243 and DATA is a string, containing the raw bits of the bitmap. |
2456 | 244 |
9569
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
245 If the optional FRAME argument is provided, change only |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
246 in that frame; otherwise change each frame." |
15884
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
247 (interactive (internal-face-interactive-stipple "stipple")) |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
248 (internal-set-face-1 face 'background-pixmap pixmap 6 frame)) |
9569
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
249 |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
250 (defalias 'set-face-background-pixmap 'set-face-stipple) |
2456 | 251 |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
252 (defun set-face-underline-p (face underline-p &optional frame) |
2456 | 253 "Specify whether face FACE is underlined. (Yes if UNDERLINE-P is non-nil.) |
254 If the optional FRAME argument is provided, change only | |
255 in that frame; otherwise change each frame." | |
256 (interactive (internal-face-interactive "underline-p" "underlined")) | |
2715
9caee9338229
* faces.el: Call internal-set-face-1, not internat-set-face-1.
Jim Blandy <jimb@redhat.com>
parents:
2714
diff
changeset
|
257 (internal-set-face-1 face 'underline underline-p 7 frame)) |
17522
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
258 |
17945
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
259 (defun set-face-inverse-video-p (face inverse-video-p &optional frame) |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
260 "Specify whether face FACE is in inverse video. |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
261 \(Yes if INVERSE-VIDEO-P is non-nil.) |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
262 If the optional FRAME argument is provided, change only |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
263 in that frame; otherwise change each frame." |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
264 (interactive (internal-face-interactive "inverse-video-p" "inverse-video")) |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
265 (internal-set-face-1 face 'inverse-video inverse-video-p 8 frame)) |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
266 |
17522
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
267 (defun set-face-bold-p (face bold-p &optional frame) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
268 "Specify whether face FACE is bold. (Yes if BOLD-P is non-nil.) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
269 If the optional FRAME argument is provided, change only |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
270 in that frame; otherwise change each frame." |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
271 (cond ((eq bold-p nil) (make-face-unbold face frame t)) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
272 (t (make-face-bold face frame t)))) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
273 |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
274 (defun set-face-italic-p (face italic-p &optional frame) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
275 "Specify whether face FACE is italic. (Yes if ITALIC-P is non-nil.) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
276 If the optional FRAME argument is provided, change only |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
277 in that frame; otherwise change each frame." |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
278 (cond ((eq italic-p nil) (make-face-unitalic face frame t)) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
279 (t (make-face-italic face frame t)))) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
280 |
19238
24bfe6095dfe
(set-face-doc-string): Define once again, as alias.
Richard M. Stallman <rms@gnu.org>
parents:
19125
diff
changeset
|
281 (defalias 'set-face-doc-string 'set-face-documentation) |
18936
5aa5fcdc25c1
(face-documentation): Renamed from face-doc-string.
Richard M. Stallman <rms@gnu.org>
parents:
18919
diff
changeset
|
282 (defun set-face-documentation (face string) |
17522
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
283 "Set the documentation string for FACE to STRING." |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
284 (put face 'face-documentation string)) |
9197
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
285 |
11153 | 286 (defun modify-face-read-string (face default name alist) |
11152
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
287 (let ((value |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
288 (completing-read |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
289 (if default |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
290 (format "Set face %s %s (default %s): " |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
291 face name (downcase default)) |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
292 (format "Set face %s %s: " face name)) |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
293 alist))) |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
294 (cond ((equal value "none") |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
295 nil) |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
296 ((equal value "") |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
297 default) |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
298 (t value)))) |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
299 |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
300 (defun modify-face (face foreground background stipple |
13725 | 301 bold-p italic-p underline-p &optional frame) |
9197
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
302 "Change the display attributes for face FACE. |
13725 | 303 If the optional FRAME argument is provided, change only |
304 in that frame; otherwise change each frame. | |
305 | |
306 FOREGROUND and BACKGROUND should be a colour name string (or list of strings to | |
307 try) or nil. STIPPLE should be a stipple pattern name string or nil. | |
308 If nil, means do not change the display attribute corresponding to that arg. | |
309 | |
9197
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
310 BOLD-P, ITALIC-P, and UNDERLINE-P specify whether the face should be set bold, |
13725 | 311 in italic, and underlined, respectively. If neither nil or t, means do not |
312 change the display attribute corresponding to that arg. | |
313 | |
314 If called interactively, prompts for a face name and face attributes." | |
9197
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
315 (interactive |
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
316 (let* ((completion-ignore-case t) |
13725 | 317 (face (symbol-name (read-face-name "Modify face: "))) |
318 (colors (mapcar 'list x-colors)) | |
319 (stipples (mapcar 'list (apply 'nconc | |
320 (mapcar 'directory-files | |
321 x-bitmap-file-path)))) | |
322 (foreground (modify-face-read-string | |
323 face (face-foreground (intern face)) | |
324 "foreground" colors)) | |
325 (background (modify-face-read-string | |
326 face (face-background (intern face)) | |
327 "background" colors)) | |
15871
4904f9f8bf41
(modify-face): Handle stipple values
Richard M. Stallman <rms@gnu.org>
parents:
15510
diff
changeset
|
328 ;; If the stipple value is a list (WIDTH HEIGHT DATA), |
4904f9f8bf41
(modify-face): Handle stipple values
Richard M. Stallman <rms@gnu.org>
parents:
15510
diff
changeset
|
329 ;; represent that as a string by printing it out. |
4904f9f8bf41
(modify-face): Handle stipple values
Richard M. Stallman <rms@gnu.org>
parents:
15510
diff
changeset
|
330 (old-stipple-string |
4904f9f8bf41
(modify-face): Handle stipple values
Richard M. Stallman <rms@gnu.org>
parents:
15510
diff
changeset
|
331 (if (stringp (face-stipple (intern face))) |
4904f9f8bf41
(modify-face): Handle stipple values
Richard M. Stallman <rms@gnu.org>
parents:
15510
diff
changeset
|
332 (face-stipple (intern face)) |
15884
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
333 (if (face-stipple (intern face)) |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
334 (prin1-to-string (face-stipple (intern face)))))) |
15871
4904f9f8bf41
(modify-face): Handle stipple values
Richard M. Stallman <rms@gnu.org>
parents:
15510
diff
changeset
|
335 (new-stipple-string |
4904f9f8bf41
(modify-face): Handle stipple values
Richard M. Stallman <rms@gnu.org>
parents:
15510
diff
changeset
|
336 (modify-face-read-string |
4904f9f8bf41
(modify-face): Handle stipple values
Richard M. Stallman <rms@gnu.org>
parents:
15510
diff
changeset
|
337 face old-stipple-string |
4904f9f8bf41
(modify-face): Handle stipple values
Richard M. Stallman <rms@gnu.org>
parents:
15510
diff
changeset
|
338 "stipple" stipples)) |
4904f9f8bf41
(modify-face): Handle stipple values
Richard M. Stallman <rms@gnu.org>
parents:
15510
diff
changeset
|
339 ;; Convert the stipple value text we read |
4904f9f8bf41
(modify-face): Handle stipple values
Richard M. Stallman <rms@gnu.org>
parents:
15510
diff
changeset
|
340 ;; back to a list if it looks like one. |
4904f9f8bf41
(modify-face): Handle stipple values
Richard M. Stallman <rms@gnu.org>
parents:
15510
diff
changeset
|
341 ;; This makes the assumption that a pixmap file name |
4904f9f8bf41
(modify-face): Handle stipple values
Richard M. Stallman <rms@gnu.org>
parents:
15510
diff
changeset
|
342 ;; won't start with an open-paren. |
4904f9f8bf41
(modify-face): Handle stipple values
Richard M. Stallman <rms@gnu.org>
parents:
15510
diff
changeset
|
343 (stipple |
15884
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
344 (and new-stipple-string |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
345 (if (string-match "^(" new-stipple-string) |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
346 (read new-stipple-string) |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
347 new-stipple-string))) |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
348 (bold-p (y-or-n-p (concat "Should face " face " be bold "))) |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
349 (italic-p (y-or-n-p (concat "Should face " face " be italic "))) |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
350 (underline-p (y-or-n-p (concat "Should face " face " be underlined "))) |
13725 | 351 (all-frames-p (y-or-n-p (concat "Modify face " face " in all frames ")))) |
9197
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
352 (message "Face %s: %s" face |
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
353 (mapconcat 'identity |
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
354 (delq nil |
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
355 (list (and foreground (concat (downcase foreground) " foreground")) |
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
356 (and background (concat (downcase background) " background")) |
15871
4904f9f8bf41
(modify-face): Handle stipple values
Richard M. Stallman <rms@gnu.org>
parents:
15510
diff
changeset
|
357 (and stipple (concat (downcase new-stipple-string) " stipple")) |
9197
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
358 (and bold-p "bold") (and italic-p "italic") |
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
359 (and underline-p "underline"))) ", ")) |
11152
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
360 (list (intern face) foreground background stipple |
13725 | 361 bold-p italic-p underline-p |
362 (if all-frames-p nil (selected-frame))))) | |
363 (condition-case nil | |
364 (face-try-color-list 'set-face-foreground face foreground frame) | |
365 (error nil)) | |
366 (condition-case nil | |
367 (face-try-color-list 'set-face-background face background frame) | |
368 (error nil)) | |
369 (condition-case nil | |
370 (set-face-stipple face stipple frame) | |
371 (error nil)) | |
17945
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
372 (cond ((eq bold-p nil) |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
373 (if (face-font face frame) |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
374 (make-face-unbold face frame t))) |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
375 ((eq bold-p t) |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
376 (make-face-bold face frame t))) |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
377 (cond ((eq italic-p nil) |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
378 (if (face-font face frame) |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
379 (make-face-unitalic face frame t))) |
13725 | 380 ((eq italic-p t) (make-face-italic face frame t))) |
381 (if (memq underline-p '(nil t)) | |
382 (set-face-underline-p face underline-p frame)) | |
9197
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
383 (and (interactive-p) (redraw-display))) |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
384 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
385 ;;;; Associating face names (symbols) with their face vectors. |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
386 |
3925
f286657c098e
* faces.el (global-face-data): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
3911
diff
changeset
|
387 (defvar global-face-data nil |
f286657c098e
* faces.el (global-face-data): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
3911
diff
changeset
|
388 "Internal data for face support functions. Not for external use. |
f286657c098e
* faces.el (global-face-data): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
3911
diff
changeset
|
389 This is an alist associating face names with the default values for |
f286657c098e
* faces.el (global-face-data): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
3911
diff
changeset
|
390 their parameters. Newly created frames get their data from here.") |
f286657c098e
* faces.el (global-face-data): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
3911
diff
changeset
|
391 |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
392 (defun face-list () |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
393 "Returns a list of all defined face names." |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
394 (mapcar 'car global-face-data)) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
395 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
396 (defun internal-find-face (name &optional frame) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
397 "Retrieve the face named NAME. Return nil if there is no such face. |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
398 If the optional argument FRAME is given, this gets the face NAME for |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
399 that frame; otherwise, it uses the selected frame. |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
400 If FRAME is the symbol t, then the global, non-frame face is returned. |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
401 If NAME is already a face, it is simply returned." |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
402 (if (and (eq frame t) (not (symbolp name))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
403 (setq name (face-name name))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
404 (if (symbolp name) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
405 (cdr (assq name |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
406 (if (eq frame t) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
407 global-face-data |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
408 (frame-face-alist (or frame (selected-frame)))))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
409 (internal-check-face name) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
410 name)) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
411 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
412 (defun internal-get-face (name &optional frame) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
413 "Retrieve the face named NAME; error if there is none. |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
414 If the optional argument FRAME is given, this gets the face NAME for |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
415 that frame; otherwise, it uses the selected frame. |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
416 If FRAME is the symbol t, then the global, non-frame face is returned. |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
417 If NAME is already a face, it is simply returned." |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
418 (or (internal-find-face name frame) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
419 (internal-check-face name))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
420 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
421 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
422 (defun internal-set-face-1 (face name value index frame) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
423 (let ((inhibit-quit t)) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
424 (if (null frame) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
425 (let ((frames (frame-list))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
426 (while frames |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
427 (internal-set-face-1 (face-name face) name value index (car frames)) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
428 (setq frames (cdr frames))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
429 (aset (internal-get-face (if (symbolp face) face (face-name face)) t) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
430 index value) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
431 value) |
17945
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
432 (let ((internal-face (internal-get-face face frame))) |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
433 (or (eq frame t) |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
434 (if (eq name 'inverse-video) |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
435 (or (eq value (aref internal-face index)) |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
436 (invert-face face frame)) |
18890
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
437 (and name (fboundp 'set-face-attribute-internal) |
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
438 (set-face-attribute-internal (face-id face) |
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
439 name value frame)))) |
17945
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
440 (aset internal-face index value))))) |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
441 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
442 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
443 (defun read-face-name (prompt) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
444 (let (face) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
445 (while (= (length face) 0) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
446 (setq face (completing-read prompt |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
447 (mapcar '(lambda (x) (list (symbol-name x))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
448 (face-list)) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
449 nil t))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
450 (intern face))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
451 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
452 (defun internal-face-interactive (what &optional bool) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
453 (let* ((fn (intern (concat "face-" what))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
454 (prompt (concat "Set " what " of face")) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
455 (face (read-face-name (concat prompt ": "))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
456 (default (if (fboundp fn) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
457 (or (funcall fn face (selected-frame)) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
458 (funcall fn 'default (selected-frame))))) |
19125
8aad7cef6fc0
(internal-face-interactive): Handle default in usual way,
Richard M. Stallman <rms@gnu.org>
parents:
19114
diff
changeset
|
459 value) |
8aad7cef6fc0
(internal-face-interactive): Handle default in usual way,
Richard M. Stallman <rms@gnu.org>
parents:
19114
diff
changeset
|
460 (setq value |
8aad7cef6fc0
(internal-face-interactive): Handle default in usual way,
Richard M. Stallman <rms@gnu.org>
parents:
19114
diff
changeset
|
461 (cond ((eq bool 'color) |
8aad7cef6fc0
(internal-face-interactive): Handle default in usual way,
Richard M. Stallman <rms@gnu.org>
parents:
19114
diff
changeset
|
462 (completing-read (concat prompt " " (symbol-name face) " to: ") |
8aad7cef6fc0
(internal-face-interactive): Handle default in usual way,
Richard M. Stallman <rms@gnu.org>
parents:
19114
diff
changeset
|
463 (mapcar (function (lambda (color) |
8aad7cef6fc0
(internal-face-interactive): Handle default in usual way,
Richard M. Stallman <rms@gnu.org>
parents:
19114
diff
changeset
|
464 (cons color color))) |
8aad7cef6fc0
(internal-face-interactive): Handle default in usual way,
Richard M. Stallman <rms@gnu.org>
parents:
19114
diff
changeset
|
465 x-colors) |
8aad7cef6fc0
(internal-face-interactive): Handle default in usual way,
Richard M. Stallman <rms@gnu.org>
parents:
19114
diff
changeset
|
466 nil nil nil nil default)) |
8aad7cef6fc0
(internal-face-interactive): Handle default in usual way,
Richard M. Stallman <rms@gnu.org>
parents:
19114
diff
changeset
|
467 (bool |
8aad7cef6fc0
(internal-face-interactive): Handle default in usual way,
Richard M. Stallman <rms@gnu.org>
parents:
19114
diff
changeset
|
468 (y-or-n-p (concat "Should face " (symbol-name face) |
8aad7cef6fc0
(internal-face-interactive): Handle default in usual way,
Richard M. Stallman <rms@gnu.org>
parents:
19114
diff
changeset
|
469 " be " bool "? "))) |
8aad7cef6fc0
(internal-face-interactive): Handle default in usual way,
Richard M. Stallman <rms@gnu.org>
parents:
19114
diff
changeset
|
470 (t |
8aad7cef6fc0
(internal-face-interactive): Handle default in usual way,
Richard M. Stallman <rms@gnu.org>
parents:
19114
diff
changeset
|
471 (read-string (concat prompt " " (symbol-name face) " to: ") |
8aad7cef6fc0
(internal-face-interactive): Handle default in usual way,
Richard M. Stallman <rms@gnu.org>
parents:
19114
diff
changeset
|
472 nil nil default)))) |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
473 (list face (if (equal value "") nil value)))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
474 |
15884
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
475 (defun internal-face-interactive-stipple (what) |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
476 (let* ((fn (intern (concat "face-" what))) |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
477 (prompt (concat "Set " what " of face")) |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
478 (face (read-face-name (concat prompt ": "))) |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
479 (default (if (fboundp fn) |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
480 (or (funcall fn face (selected-frame)) |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
481 (funcall fn 'default (selected-frame))))) |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
482 ;; If the stipple value is a list (WIDTH HEIGHT DATA), |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
483 ;; represent that as a string by printing it out. |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
484 (old-stipple-string |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
485 (if (stringp (face-stipple face)) |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
486 (face-stipple face) |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
487 (if (null (face-stipple face)) |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
488 nil |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
489 (prin1-to-string (face-stipple face))))) |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
490 (new-stipple-string |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
491 (read-string |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
492 (concat prompt " " (symbol-name face) " to: ") |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
493 old-stipple-string)) |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
494 ;; Convert the stipple value text we read |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
495 ;; back to a list if it looks like one. |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
496 ;; This makes the assumption that a pixmap file name |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
497 ;; won't start with an open-paren. |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
498 (stipple |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
499 (if (string-match "^(" new-stipple-string) |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
500 (read new-stipple-string) |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
501 new-stipple-string))) |
ea80dae13b2f
(modify-face): Handle nil as stipple value.
Richard M. Stallman <rms@gnu.org>
parents:
15871
diff
changeset
|
502 (list face (if (equal stipple "") nil stipple)))) |
2456 | 503 |
17386
b251c8820860
(make-face): New arg no-resources.
Richard M. Stallman <rms@gnu.org>
parents:
17173
diff
changeset
|
504 (defun make-face (name &optional no-resources) |
2456 | 505 "Define a new FACE on all frames. |
506 You can modify the font, color, etc of this face with the set-face- functions. | |
17386
b251c8820860
(make-face): New arg no-resources.
Richard M. Stallman <rms@gnu.org>
parents:
17173
diff
changeset
|
507 If NO-RESOURCES is non-nil, then we ignore X resources |
b251c8820860
(make-face): New arg no-resources.
Richard M. Stallman <rms@gnu.org>
parents:
17173
diff
changeset
|
508 and always make a face whose attributes are all nil. |
b251c8820860
(make-face): New arg no-resources.
Richard M. Stallman <rms@gnu.org>
parents:
17173
diff
changeset
|
509 |
2456 | 510 If the face already exists, it is unmodified." |
3001
c6c6e476d93d
* faces.el (make-face): Change interactive spec to 'S'.
Jim Blandy <jimb@redhat.com>
parents:
2906
diff
changeset
|
511 (interactive "SMake face: ") |
2456 | 512 (or (internal-find-face name) |
18890
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
513 (let ((face (make-vector 10 nil))) |
2456 | 514 (aset face 0 'face) |
515 (aset face 1 name) | |
516 (let* ((frames (frame-list)) | |
517 (inhibit-quit t) | |
518 (id (internal-next-face-id))) | |
18063
89a58c1d8d2c
(make-face): Call make-face-internal only if defined.
Richard M. Stallman <rms@gnu.org>
parents:
17950
diff
changeset
|
519 (if (fboundp 'make-face-internal) |
89a58c1d8d2c
(make-face): Call make-face-internal only if defined.
Richard M. Stallman <rms@gnu.org>
parents:
17950
diff
changeset
|
520 (make-face-internal id)) |
2456 | 521 (aset face 2 id) |
522 (while frames | |
523 (set-frame-face-alist (car frames) | |
524 (cons (cons name (copy-sequence face)) | |
525 (frame-face-alist (car frames)))) | |
526 (setq frames (cdr frames))) | |
527 (setq global-face-data (cons (cons name face) global-face-data))) | |
17386
b251c8820860
(make-face): New arg no-resources.
Richard M. Stallman <rms@gnu.org>
parents:
17173
diff
changeset
|
528 ;; When making a face after frames already exist |
b251c8820860
(make-face): New arg no-resources.
Richard M. Stallman <rms@gnu.org>
parents:
17173
diff
changeset
|
529 (or no-resources |
b251c8820860
(make-face): New arg no-resources.
Richard M. Stallman <rms@gnu.org>
parents:
17173
diff
changeset
|
530 (if (memq window-system '(x w32)) |
b251c8820860
(make-face): New arg no-resources.
Richard M. Stallman <rms@gnu.org>
parents:
17173
diff
changeset
|
531 (make-face-x-resource-internal face))) |
b251c8820860
(make-face): New arg no-resources.
Richard M. Stallman <rms@gnu.org>
parents:
17173
diff
changeset
|
532 ;; Add to menu of faces. |
9622
14e1032a7ae7
(make-face): Add new face to Face menu on creation. -- Bng
Boris Goldowsky <boris@gnu.org>
parents:
9572
diff
changeset
|
533 (if (fboundp 'facemenu-add-new-face) |
14e1032a7ae7
(make-face): Add new face to Face menu on creation. -- Bng
Boris Goldowsky <boris@gnu.org>
parents:
9572
diff
changeset
|
534 (facemenu-add-new-face name)) |
8011
1bb462fc29fc
(make-face): Return the face name, not the vector.
Richard M. Stallman <rms@gnu.org>
parents:
8000
diff
changeset
|
535 face)) |
1bb462fc29fc
(make-face): Return the face name, not the vector.
Richard M. Stallman <rms@gnu.org>
parents:
8000
diff
changeset
|
536 name) |
2456 | 537 |
17386
b251c8820860
(make-face): New arg no-resources.
Richard M. Stallman <rms@gnu.org>
parents:
17173
diff
changeset
|
538 (defun make-empty-face (face) |
b251c8820860
(make-face): New arg no-resources.
Richard M. Stallman <rms@gnu.org>
parents:
17173
diff
changeset
|
539 "Define a new FACE on all frames, which initially reflects the defaults. |
b251c8820860
(make-face): New arg no-resources.
Richard M. Stallman <rms@gnu.org>
parents:
17173
diff
changeset
|
540 You can modify the font, color, etc of this face with the set-face- functions. |
b251c8820860
(make-face): New arg no-resources.
Richard M. Stallman <rms@gnu.org>
parents:
17173
diff
changeset
|
541 If the face already exists, it is unmodified." |
b251c8820860
(make-face): New arg no-resources.
Richard M. Stallman <rms@gnu.org>
parents:
17173
diff
changeset
|
542 (interactive "SMake empty face: ") |
b251c8820860
(make-face): New arg no-resources.
Richard M. Stallman <rms@gnu.org>
parents:
17173
diff
changeset
|
543 (make-face face t)) |
b251c8820860
(make-face): New arg no-resources.
Richard M. Stallman <rms@gnu.org>
parents:
17173
diff
changeset
|
544 |
2456 | 545 ;; Fill in a face by default based on X resources, for all existing frames. |
546 ;; This has to be done when a new face is made. | |
547 (defun make-face-x-resource-internal (face &optional frame set-anyway) | |
548 (cond ((null frame) | |
549 (let ((frames (frame-list))) | |
550 (while frames | |
16590
a0cfcb9f8033
Use w32 instead of ms-windows for window-system symbol
Geoff Voelker <voelker@cs.washington.edu>
parents:
16199
diff
changeset
|
551 (if (memq (framep (car frames)) '(x w32)) |
6873
086e14489073
(make-face-x-resource-internal): Don't mess with terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
6871
diff
changeset
|
552 (make-face-x-resource-internal (face-name face) |
086e14489073
(make-face-x-resource-internal): Don't mess with terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
6871
diff
changeset
|
553 (car frames) set-anyway)) |
2456 | 554 (setq frames (cdr frames))))) |
555 (t | |
556 (setq face (internal-get-face (face-name face) frame)) | |
557 ;; | |
558 ;; These are things like "attributeForeground" instead of simply | |
559 ;; "foreground" because people tend to do things like "*foreground", | |
560 ;; which would cause all faces to be fully qualified, making faces | |
561 ;; inherit attributes in a non-useful way. So we've made them slightly | |
562 ;; less obvious to specify in order to make them work correctly in | |
563 ;; more random environments. | |
564 ;; | |
565 ;; I think these should be called "face.faceForeground" instead of | |
566 ;; "face.attributeForeground", but they're the way they are for | |
567 ;; hysterical reasons. | |
568 ;; | |
569 (let* ((name (symbol-name (face-name face))) | |
570 (fn (or (x-get-resource (concat name ".attributeFont") | |
571 "Face.AttributeFont") | |
572 (and set-anyway (face-font face)))) | |
573 (fg (or (x-get-resource (concat name ".attributeForeground") | |
574 "Face.AttributeForeground") | |
575 (and set-anyway (face-foreground face)))) | |
576 (bg (or (x-get-resource (concat name ".attributeBackground") | |
577 "Face.AttributeBackground") | |
578 (and set-anyway (face-background face)))) | |
9569
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
579 (bgp (or (x-get-resource (concat name ".attributeStipple") |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
580 "Face.AttributeStipple") |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
581 (x-get-resource (concat name ".attributeBackgroundPixmap") |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
582 "Face.AttributeBackgroundPixmap") |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
583 (and set-anyway (face-stipple face)))) |
8149
5e27997957db
(x-create-frame-with-faces): Ignore case in X resource.
Richard M. Stallman <rms@gnu.org>
parents:
8109
diff
changeset
|
584 (ulp (let ((resource (x-get-resource |
5e27997957db
(x-create-frame-with-faces): Ignore case in X resource.
Richard M. Stallman <rms@gnu.org>
parents:
8109
diff
changeset
|
585 (concat name ".attributeUnderline") |
5e27997957db
(x-create-frame-with-faces): Ignore case in X resource.
Richard M. Stallman <rms@gnu.org>
parents:
8109
diff
changeset
|
586 "Face.AttributeUnderline"))) |
5e27997957db
(x-create-frame-with-faces): Ignore case in X resource.
Richard M. Stallman <rms@gnu.org>
parents:
8109
diff
changeset
|
587 (if resource |
5e27997957db
(x-create-frame-with-faces): Ignore case in X resource.
Richard M. Stallman <rms@gnu.org>
parents:
8109
diff
changeset
|
588 (member (downcase resource) '("on" "true")) |
5e27997957db
(x-create-frame-with-faces): Ignore case in X resource.
Richard M. Stallman <rms@gnu.org>
parents:
8109
diff
changeset
|
589 (and set-anyway (face-underline-p face))))) |
2456 | 590 ) |
591 (if fn | |
592 (condition-case () | |
12460
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
593 (cond ((string= fn "italic") |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
594 (make-face-italic face)) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
595 ((string= fn "bold") |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
596 (make-face-bold face)) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
597 ((string= fn "bold-italic") |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
598 (make-face-bold-italic face)) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
599 (t |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
600 (set-face-font face fn frame))) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
601 (error |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
602 (if (member fn '("italic" "bold" "bold-italic")) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
603 (message "no %s version found for face `%s'" fn name) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
604 (message "font `%s' not found for face `%s'" fn name))))) |
2456 | 605 (if fg |
606 (condition-case () | |
607 (set-face-foreground face fg frame) | |
608 (error (message "color `%s' not allocated for face `%s'" fg name)))) | |
609 (if bg | |
610 (condition-case () | |
611 (set-face-background face bg frame) | |
612 (error (message "color `%s' not allocated for face `%s'" bg name)))) | |
9569
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
613 (if bgp |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
614 (condition-case () |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
615 (set-face-stipple face bgp frame) |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
616 (error (message "pixmap `%s' not found for face `%s'" bgp name)))) |
2456 | 617 (if (or ulp set-anyway) |
618 (set-face-underline-p face ulp frame)) | |
619 ))) | |
620 face) | |
621 | |
5849 | 622 (defun copy-face (old-face new-face &optional frame new-frame) |
623 "Define a face just like OLD-FACE, with name NEW-FACE. | |
624 If NEW-FACE already exists as a face, it is modified to be like OLD-FACE. | |
625 If it doesn't already exist, it is created. | |
626 | |
627 If the optional argument FRAME is given as a frame, | |
628 NEW-FACE is changed on FRAME only. | |
629 If FRAME is t, the frame-independent default specification for OLD-FACE | |
630 is copied to NEW-FACE. | |
631 If FRAME is nil, copying is done for the frame-independent defaults | |
632 and for each existing frame. | |
4083
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
633 If the optional fourth argument NEW-FRAME is given, |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
634 copy the information from face OLD-FACE on frame FRAME |
5849 | 635 to NEW-FACE on frame NEW-FRAME." |
4083
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
636 (or new-frame (setq new-frame frame)) |
6145
843ce3f872c2
(copy-face): Don't change old-face and new-face before the frame loop.
Karl Heuer <kwzh@gnu.org>
parents:
5955
diff
changeset
|
637 (let ((inhibit-quit t)) |
2456 | 638 (if (null frame) |
639 (let ((frames (frame-list))) | |
640 (while frames | |
5849 | 641 (copy-face old-face new-face (car frames)) |
2456 | 642 (setq frames (cdr frames))) |
5849 | 643 (copy-face old-face new-face t)) |
6145
843ce3f872c2
(copy-face): Don't change old-face and new-face before the frame loop.
Karl Heuer <kwzh@gnu.org>
parents:
5955
diff
changeset
|
644 (setq old-face (internal-get-face old-face frame)) |
843ce3f872c2
(copy-face): Don't change old-face and new-face before the frame loop.
Karl Heuer <kwzh@gnu.org>
parents:
5955
diff
changeset
|
645 (setq new-face (or (internal-find-face new-face new-frame) |
843ce3f872c2
(copy-face): Don't change old-face and new-face before the frame loop.
Karl Heuer <kwzh@gnu.org>
parents:
5955
diff
changeset
|
646 (make-face new-face))) |
8515
3043fef029a7
(copy-face): Ignore errors in set-face-font.
Richard M. Stallman <rms@gnu.org>
parents:
8377
diff
changeset
|
647 (condition-case nil |
3043fef029a7
(copy-face): Ignore errors in set-face-font.
Richard M. Stallman <rms@gnu.org>
parents:
8377
diff
changeset
|
648 ;; A face that has a global symbolic font modifier such as `bold' |
3043fef029a7
(copy-face): Ignore errors in set-face-font.
Richard M. Stallman <rms@gnu.org>
parents:
8377
diff
changeset
|
649 ;; might legitimately get an error here. |
3043fef029a7
(copy-face): Ignore errors in set-face-font.
Richard M. Stallman <rms@gnu.org>
parents:
8377
diff
changeset
|
650 ;; Use the frame's default font in that case. |
3043fef029a7
(copy-face): Ignore errors in set-face-font.
Richard M. Stallman <rms@gnu.org>
parents:
8377
diff
changeset
|
651 (set-face-font new-face (face-font old-face frame) new-frame) |
3043fef029a7
(copy-face): Ignore errors in set-face-font.
Richard M. Stallman <rms@gnu.org>
parents:
8377
diff
changeset
|
652 (error |
3043fef029a7
(copy-face): Ignore errors in set-face-font.
Richard M. Stallman <rms@gnu.org>
parents:
8377
diff
changeset
|
653 (set-face-font new-face nil new-frame))) |
18890
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
654 (set-face-font-explicit new-face (face-font-explicit old-face frame) |
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
655 new-frame) |
4083
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
656 (set-face-foreground new-face (face-foreground old-face frame) new-frame) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
657 (set-face-background new-face (face-background old-face frame) new-frame) |
9569
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
658 (set-face-stipple new-face |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
659 (face-stipple old-face frame) |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
660 new-frame) |
2456 | 661 (set-face-underline-p new-face (face-underline-p old-face frame) |
4083
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
662 new-frame)) |
2456 | 663 new-face)) |
664 | |
665 (defun face-equal (face1 face2 &optional frame) | |
2906
ca9bf00d4b19
* xfaces.el (face-equal): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2826
diff
changeset
|
666 "True if the faces FACE1 and FACE2 display in the same way." |
2456 | 667 (setq face1 (internal-get-face face1 frame) |
668 face2 (internal-get-face face2 frame)) | |
669 (and (equal (face-foreground face1 frame) (face-foreground face2 frame)) | |
670 (equal (face-background face1 frame) (face-background face2 frame)) | |
671 (equal (face-font face1 frame) (face-font face2 frame)) | |
8000
6d0a448be1ec
(face-equal): Do check the underline attribute.
Richard M. Stallman <rms@gnu.org>
parents:
7936
diff
changeset
|
672 (eq (face-underline-p face1 frame) (face-underline-p face2 frame)) |
9569
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
673 (equal (face-stipple face1 frame) |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
674 (face-stipple face2 frame)))) |
2456 | 675 |
676 (defun face-differs-from-default-p (face &optional frame) | |
677 "True if face FACE displays differently from the default face, on FRAME. | |
678 A face is considered to be ``the same'' as the default face if it is | |
679 actually specified in the same way (equivalent fonts, etc) or if it is | |
680 fully unspecified, and thus inherits the attributes of any face it | |
10379
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
681 is displayed on top of. |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
682 |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
683 The optional argument FRAME specifies which frame to test; |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
684 if FRAME is t, test the default for new frames. |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
685 If FRAME is nil or omitted, test the selected frame." |
2456 | 686 (let ((default (internal-get-face 'default frame))) |
687 (setq face (internal-get-face face frame)) | |
688 (not (and (or (equal (face-foreground default frame) | |
689 (face-foreground face frame)) | |
690 (null (face-foreground face frame))) | |
691 (or (equal (face-background default frame) | |
692 (face-background face frame)) | |
693 (null (face-background face frame))) | |
17160
5bf55bb553f2
When testing FACE's non-nil face-font with the default face font, use the frame's font parameter if the default face's face-font is nil.
Simon Marshall <simon@gnu.org>
parents:
16841
diff
changeset
|
694 (or (null (face-font face frame)) |
5bf55bb553f2
When testing FACE's non-nil face-font with the default face font, use the frame's font parameter if the default face's face-font is nil.
Simon Marshall <simon@gnu.org>
parents:
16841
diff
changeset
|
695 (equal (face-font face frame) |
5bf55bb553f2
When testing FACE's non-nil face-font with the default face font, use the frame's font parameter if the default face's face-font is nil.
Simon Marshall <simon@gnu.org>
parents:
16841
diff
changeset
|
696 (or (face-font default frame) |
5bf55bb553f2
When testing FACE's non-nil face-font with the default face font, use the frame's font parameter if the default face's face-font is nil.
Simon Marshall <simon@gnu.org>
parents:
16841
diff
changeset
|
697 (downcase |
5bf55bb553f2
When testing FACE's non-nil face-font with the default face font, use the frame's font parameter if the default face's face-font is nil.
Simon Marshall <simon@gnu.org>
parents:
16841
diff
changeset
|
698 (cdr (assq 'font (frame-parameters frame))))))) |
9569
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
699 (or (equal (face-stipple default frame) |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
700 (face-stipple face frame)) |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
701 (null (face-stipple face frame))) |
2456 | 702 (equal (face-underline-p default frame) |
703 (face-underline-p face frame)) | |
704 )))) | |
705 | |
10379
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
706 (defun face-nontrivial-p (face &optional frame) |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
707 "True if face FACE has some non-nil attribute. |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
708 The optional argument FRAME specifies which frame to test; |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
709 if FRAME is t, test the default for new frames. |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
710 If FRAME is nil or omitted, test the selected frame." |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
711 (setq face (internal-get-face face frame)) |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
712 (or (face-foreground face frame) |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
713 (face-background face frame) |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
714 (face-font face frame) |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
715 (face-stipple face frame) |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
716 (face-underline-p face frame))) |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
717 |
2456 | 718 |
719 (defun invert-face (face &optional frame) | |
720 "Swap the foreground and background colors of face FACE. | |
721 If the face doesn't specify both foreground and background, then | |
2800
a7b260d27c2c
(face-initialize): Don't create the `modeline' face.
Richard M. Stallman <rms@gnu.org>
parents:
2764
diff
changeset
|
722 set its foreground and background to the default background and foreground." |
2456 | 723 (interactive (list (read-face-name "Invert face: "))) |
724 (setq face (internal-get-face face frame)) | |
725 (let ((fg (face-foreground face frame)) | |
726 (bg (face-background face frame))) | |
727 (if (or fg bg) | |
728 (progn | |
729 (set-face-foreground face bg frame) | |
730 (set-face-background face fg frame)) | |
16841
5c964321c440
(invert-face): Handle inverting the default face better.
Richard M. Stallman <rms@gnu.org>
parents:
16687
diff
changeset
|
731 (let* ((frame-bg (cdr (assq 'background-color (frame-parameters frame)))) |
5c964321c440
(invert-face): Handle inverting the default face better.
Richard M. Stallman <rms@gnu.org>
parents:
16687
diff
changeset
|
732 (default-bg (or (face-background 'default frame) |
5c964321c440
(invert-face): Handle inverting the default face better.
Richard M. Stallman <rms@gnu.org>
parents:
16687
diff
changeset
|
733 frame-bg)) |
5c964321c440
(invert-face): Handle inverting the default face better.
Richard M. Stallman <rms@gnu.org>
parents:
16687
diff
changeset
|
734 (frame-fg (cdr (assq 'foreground-color (frame-parameters frame)))) |
5c964321c440
(invert-face): Handle inverting the default face better.
Richard M. Stallman <rms@gnu.org>
parents:
16687
diff
changeset
|
735 (default-fg (or (face-foreground 'default frame) |
5c964321c440
(invert-face): Handle inverting the default face better.
Richard M. Stallman <rms@gnu.org>
parents:
16687
diff
changeset
|
736 frame-fg))) |
5c964321c440
(invert-face): Handle inverting the default face better.
Richard M. Stallman <rms@gnu.org>
parents:
16687
diff
changeset
|
737 (set-face-foreground face default-bg frame) |
5c964321c440
(invert-face): Handle inverting the default face better.
Richard M. Stallman <rms@gnu.org>
parents:
16687
diff
changeset
|
738 (set-face-background face default-fg frame)))) |
2456 | 739 face) |
740 | |
741 | |
742 (defun internal-try-face-font (face font &optional frame) | |
743 "Like set-face-font, but returns nil on failure instead of an error." | |
744 (condition-case () | |
18890
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
745 (set-face-font-auto face font frame) |
2456 | 746 (error nil))) |
747 | |
748 ;; Manipulating font names. | |
749 | |
16687
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16590
diff
changeset
|
750 (defvar x-font-regexp nil) |
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16590
diff
changeset
|
751 (defvar x-font-regexp-head nil) |
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16590
diff
changeset
|
752 (defvar x-font-regexp-weight nil) |
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16590
diff
changeset
|
753 (defvar x-font-regexp-slant nil) |
2456 | 754 |
12668
7660e82d0346
(x-font-regexp-weight-subnum, x-font-regexp-slant-subnum)
Karl Heuer <kwzh@gnu.org>
parents:
12651
diff
changeset
|
755 (defconst x-font-regexp-weight-subnum 1) |
7660e82d0346
(x-font-regexp-weight-subnum, x-font-regexp-slant-subnum)
Karl Heuer <kwzh@gnu.org>
parents:
12651
diff
changeset
|
756 (defconst x-font-regexp-slant-subnum 2) |
7660e82d0346
(x-font-regexp-weight-subnum, x-font-regexp-slant-subnum)
Karl Heuer <kwzh@gnu.org>
parents:
12651
diff
changeset
|
757 (defconst x-font-regexp-swidth-subnum 3) |
7660e82d0346
(x-font-regexp-weight-subnum, x-font-regexp-slant-subnum)
Karl Heuer <kwzh@gnu.org>
parents:
12651
diff
changeset
|
758 (defconst x-font-regexp-adstyle-subnum 4) |
7660e82d0346
(x-font-regexp-weight-subnum, x-font-regexp-slant-subnum)
Karl Heuer <kwzh@gnu.org>
parents:
12651
diff
changeset
|
759 |
2456 | 760 ;;; Regexps matching font names in "Host Portable Character Representation." |
761 ;;; | |
762 (let ((- "[-?]") | |
763 (foundry "[^-]+") | |
764 (family "[^-]+") | |
765 (weight "\\(bold\\|demibold\\|medium\\)") ; 1 | |
766 ; (weight\? "\\(\\*\\|bold\\|demibold\\|medium\\|\\)") ; 1 | |
767 (weight\? "\\([^-]*\\)") ; 1 | |
768 (slant "\\([ior]\\)") ; 2 | |
769 ; (slant\? "\\([ior?*]?\\)") ; 2 | |
770 (slant\? "\\([^-]?\\)") ; 2 | |
771 ; (swidth "\\(\\*\\|normal\\|semicondensed\\|\\)") ; 3 | |
772 (swidth "\\([^-]*\\)") ; 3 | |
773 ; (adstyle "\\(\\*\\|sans\\|\\)") ; 4 | |
12690
e2d3fa52d100
(x-font-regexp): Add \\(\\) for substring extraction.
Karl Heuer <kwzh@gnu.org>
parents:
12668
diff
changeset
|
774 (adstyle "\\([^-]*\\)") ; 4 |
2456 | 775 (pixelsize "[0-9]+") |
776 (pointsize "[0-9][0-9]+") | |
777 (resx "[0-9][0-9]+") | |
778 (resy "[0-9][0-9]+") | |
779 (spacing "[cmp?*]") | |
780 (avgwidth "[0-9]+") | |
781 (registry "[^-]+") | |
782 (encoding "[^-]+") | |
783 ) | |
784 (setq x-font-regexp | |
785 (concat "\\`\\*?[-?*]" | |
786 foundry - family - weight\? - slant\? - swidth - adstyle - | |
12475
eb436b0c4ab3
(x-font-regexp): Include the avgwidth.
Richard M. Stallman <rms@gnu.org>
parents:
12460
diff
changeset
|
787 pixelsize - pointsize - resx - resy - spacing - avgwidth - |
eb436b0c4ab3
(x-font-regexp): Include the avgwidth.
Richard M. Stallman <rms@gnu.org>
parents:
12460
diff
changeset
|
788 registry - encoding "\\*?\\'" |
2456 | 789 )) |
790 (setq x-font-regexp-head | |
791 (concat "\\`[-?*]" foundry - family - weight\? - slant\? | |
792 "\\([-*?]\\|\\'\\)")) | |
793 (setq x-font-regexp-slant (concat - slant -)) | |
794 (setq x-font-regexp-weight (concat - weight -)) | |
795 nil) | |
796 | |
3071
68de05fb5751
* faces.el (set-face-font): Call x-resolve-font-name on the font
Jim Blandy <jimb@redhat.com>
parents:
3049
diff
changeset
|
797 (defun x-resolve-font-name (pattern &optional face frame) |
68de05fb5751
* faces.el (set-face-font): Call x-resolve-font-name on the font
Jim Blandy <jimb@redhat.com>
parents:
3049
diff
changeset
|
798 "Return a font name matching PATTERN. |
68de05fb5751
* faces.el (set-face-font): Call x-resolve-font-name on the font
Jim Blandy <jimb@redhat.com>
parents:
3049
diff
changeset
|
799 All wildcards in PATTERN become substantiated. |
3130
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
800 If PATTERN is nil, return the name of the frame's base font, which never |
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
801 contains wildcards. |
10170
5fc240a3e4a0
(face-initialize): Test for framep not t or nil.
Richard M. Stallman <rms@gnu.org>
parents:
10107
diff
changeset
|
802 Given optional arguments FACE and FRAME, return a font which is |
5fc240a3e4a0
(face-initialize): Test for framep not t or nil.
Richard M. Stallman <rms@gnu.org>
parents:
10107
diff
changeset
|
803 also the same size as FACE on FRAME, or fail." |
3233
28b2df35c33e
(x-resolve-font-name): Allow symbol as FACE arg.
Richard M. Stallman <rms@gnu.org>
parents:
3182
diff
changeset
|
804 (or (symbolp face) |
28b2df35c33e
(x-resolve-font-name): Allow symbol as FACE arg.
Richard M. Stallman <rms@gnu.org>
parents:
3182
diff
changeset
|
805 (setq face (face-name face))) |
28b2df35c33e
(x-resolve-font-name): Allow symbol as FACE arg.
Richard M. Stallman <rms@gnu.org>
parents:
3182
diff
changeset
|
806 (and (eq frame t) |
28b2df35c33e
(x-resolve-font-name): Allow symbol as FACE arg.
Richard M. Stallman <rms@gnu.org>
parents:
3182
diff
changeset
|
807 (setq frame nil)) |
3130
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
808 (if pattern |
5092
36508a7c0a3f
(x-resolve-font-name): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5081
diff
changeset
|
809 ;; Note that x-list-fonts has code to handle a face with nil as its font. |
16002
c8cbde1d3f11
(internal-set-face-1): When calling x-list-fonts, ask for just one match.
Richard M. Stallman <rms@gnu.org>
parents:
15884
diff
changeset
|
810 (let ((fonts (x-list-fonts pattern face frame 1))) |
3130
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
811 (or fonts |
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
812 (if face |
10584 | 813 (if (string-match "\\*" pattern) |
814 (if (null (face-font face)) | |
815 (error "No matching fonts are the same height as the frame default font") | |
816 (error "No matching fonts are the same height as face `%s'" face)) | |
817 (if (null (face-font face)) | |
818 (error "Height of font `%s' doesn't match the frame default font" | |
819 pattern) | |
820 (error "Height of font `%s' doesn't match face `%s'" | |
821 pattern face))) | |
3353
8cbd38886eef
(x-resolve-font-name): Clean up error messages.
Richard M. Stallman <rms@gnu.org>
parents:
3298
diff
changeset
|
822 (error "No fonts match `%s'" pattern))) |
3130
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
823 (car fonts)) |
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
824 (cdr (assq 'font (frame-parameters (selected-frame)))))) |
3071
68de05fb5751
* faces.el (set-face-font): Call x-resolve-font-name on the font
Jim Blandy <jimb@redhat.com>
parents:
3049
diff
changeset
|
825 |
2456 | 826 (defun x-frob-font-weight (font which) |
13704
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
827 (let ((case-fold-search t)) |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
828 (cond ((string-match x-font-regexp font) |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
829 (concat (substring font 0 |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
830 (match-beginning x-font-regexp-weight-subnum)) |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
831 which |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
832 (substring font (match-end x-font-regexp-weight-subnum) |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
833 (match-beginning x-font-regexp-adstyle-subnum)) |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
834 ;; Replace the ADD_STYLE_NAME field with * |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
835 ;; because the info in it may not be the same |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
836 ;; for related fonts. |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
837 "*" |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
838 (substring font (match-end x-font-regexp-adstyle-subnum)))) |
14880
b405f39b5493
(x-frob-font-slant): Properly handle a match against
Richard M. Stallman <rms@gnu.org>
parents:
14409
diff
changeset
|
839 ((string-match x-font-regexp-head font) |
b405f39b5493
(x-frob-font-slant): Properly handle a match against
Richard M. Stallman <rms@gnu.org>
parents:
14409
diff
changeset
|
840 (concat (substring font 0 (match-beginning 1)) which |
b405f39b5493
(x-frob-font-slant): Properly handle a match against
Richard M. Stallman <rms@gnu.org>
parents:
14409
diff
changeset
|
841 (substring font (match-end 1)))) |
b405f39b5493
(x-frob-font-slant): Properly handle a match against
Richard M. Stallman <rms@gnu.org>
parents:
14409
diff
changeset
|
842 ((string-match x-font-regexp-weight font) |
13704
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
843 (concat (substring font 0 (match-beginning 1)) which |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
844 (substring font (match-end 1))))))) |
2456 | 845 |
846 (defun x-frob-font-slant (font which) | |
13704
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
847 (let ((case-fold-search t)) |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
848 (cond ((string-match x-font-regexp font) |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
849 (concat (substring font 0 |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
850 (match-beginning x-font-regexp-slant-subnum)) |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
851 which |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
852 (substring font (match-end x-font-regexp-slant-subnum) |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
853 (match-beginning x-font-regexp-adstyle-subnum)) |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
854 ;; Replace the ADD_STYLE_NAME field with * |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
855 ;; because the info in it may not be the same |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
856 ;; for related fonts. |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
857 "*" |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
858 (substring font (match-end x-font-regexp-adstyle-subnum)))) |
14880
b405f39b5493
(x-frob-font-slant): Properly handle a match against
Richard M. Stallman <rms@gnu.org>
parents:
14409
diff
changeset
|
859 ((string-match x-font-regexp-head font) |
b405f39b5493
(x-frob-font-slant): Properly handle a match against
Richard M. Stallman <rms@gnu.org>
parents:
14409
diff
changeset
|
860 (concat (substring font 0 (match-beginning 2)) which |
b405f39b5493
(x-frob-font-slant): Properly handle a match against
Richard M. Stallman <rms@gnu.org>
parents:
14409
diff
changeset
|
861 (substring font (match-end 2)))) |
b405f39b5493
(x-frob-font-slant): Properly handle a match against
Richard M. Stallman <rms@gnu.org>
parents:
14409
diff
changeset
|
862 ((string-match x-font-regexp-slant font) |
13704
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
863 (concat (substring font 0 (match-beginning 1)) which |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
864 (substring font (match-end 1))))))) |
2456 | 865 |
866 (defun x-make-font-bold (font) | |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
867 "Given an X font specification, make a bold version of it. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
868 If that can't be done, return nil." |
2456 | 869 (x-frob-font-weight font "bold")) |
870 | |
871 (defun x-make-font-demibold (font) | |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
872 "Given an X font specification, make a demibold version of it. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
873 If that can't be done, return nil." |
2456 | 874 (x-frob-font-weight font "demibold")) |
875 | |
876 (defun x-make-font-unbold (font) | |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
877 "Given an X font specification, make a non-bold version of it. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
878 If that can't be done, return nil." |
2456 | 879 (x-frob-font-weight font "medium")) |
880 | |
881 (defun x-make-font-italic (font) | |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
882 "Given an X font specification, make an italic version of it. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
883 If that can't be done, return nil." |
2456 | 884 (x-frob-font-slant font "i")) |
885 | |
886 (defun x-make-font-oblique (font) ; you say tomayto... | |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
887 "Given an X font specification, make an oblique version of it. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
888 If that can't be done, return nil." |
2456 | 889 (x-frob-font-slant font "o")) |
890 | |
891 (defun x-make-font-unitalic (font) | |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
892 "Given an X font specification, make a non-italic version of it. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
893 If that can't be done, return nil." |
2456 | 894 (x-frob-font-slant font "r")) |
17752
2687f3d7c191
(x-make-font-bold-italic): New function.
Kenichi Handa <handa@m17n.org>
parents:
17560
diff
changeset
|
895 |
2687f3d7c191
(x-make-font-bold-italic): New function.
Kenichi Handa <handa@m17n.org>
parents:
17560
diff
changeset
|
896 (defun x-make-font-bold-italic (font) |
2687f3d7c191
(x-make-font-bold-italic): New function.
Kenichi Handa <handa@m17n.org>
parents:
17560
diff
changeset
|
897 "Given an X font specification, make a bold and italic version of it. |
2687f3d7c191
(x-make-font-bold-italic): New function.
Kenichi Handa <handa@m17n.org>
parents:
17560
diff
changeset
|
898 If that can't be done, return nil." |
2687f3d7c191
(x-make-font-bold-italic): New function.
Kenichi Handa <handa@m17n.org>
parents:
17560
diff
changeset
|
899 (and (setq font (x-make-font-bold font)) |
2687f3d7c191
(x-make-font-bold-italic): New function.
Kenichi Handa <handa@m17n.org>
parents:
17560
diff
changeset
|
900 (x-make-font-italic font))) |
2456 | 901 |
902 ;;; non-X-specific interface | |
903 | |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
904 (defun make-face-bold (face &optional frame noerror) |
2456 | 905 "Make the font of the given face be bold, if possible. |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
906 If NOERROR is non-nil, return nil on failure." |
2456 | 907 (interactive (list (read-face-name "Make which face bold: "))) |
5199
b8b8063551e1
(make-face-unitalic, make-face-unbold, make-face-bold)
Richard M. Stallman <rms@gnu.org>
parents:
5092
diff
changeset
|
908 (if (and (eq frame t) (listp (face-font face t))) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
909 (set-face-font face (if (memq 'italic (face-font face t)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
910 '(bold italic) '(bold)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
911 t) |
12651
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
912 (let (font) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
913 (if (null frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
914 (let ((frames (frame-list))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
915 ;; Make this face bold in global-face-data. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
916 (make-face-bold face t noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
917 ;; Make this face bold in each frame. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
918 (while frames |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
919 (make-face-bold face (car frames) noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
920 (setq frames (cdr frames)))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
921 (setq face (internal-get-face face frame)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
922 (setq font (or (face-font face frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
923 (face-font face t))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
924 (if (listp font) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
925 (setq font nil)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
926 (setq font (or font |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
927 (face-font 'default frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
928 (cdr (assq 'font (frame-parameters frame))))) |
12651
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
929 (or (and font (make-face-bold-internal face frame font)) |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
930 ;; We failed to find a bold version of the font. |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
931 noerror |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
932 (error "No bold version of %S" font)))))) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
933 |
8109
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
934 (defun make-face-bold-internal (face frame font) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
935 (let (f2) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
936 (or (and (setq f2 (x-make-font-bold font)) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
937 (internal-try-face-font face f2 frame)) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
938 (and (setq f2 (x-make-font-demibold font)) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
939 (internal-try-face-font face f2 frame))))) |
2456 | 940 |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
941 (defun make-face-italic (face &optional frame noerror) |
2456 | 942 "Make the font of the given face be italic, if possible. |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
943 If NOERROR is non-nil, return nil on failure." |
2456 | 944 (interactive (list (read-face-name "Make which face italic: "))) |
5199
b8b8063551e1
(make-face-unitalic, make-face-unbold, make-face-bold)
Richard M. Stallman <rms@gnu.org>
parents:
5092
diff
changeset
|
945 (if (and (eq frame t) (listp (face-font face t))) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
946 (set-face-font face (if (memq 'bold (face-font face t)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
947 '(bold italic) '(italic)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
948 t) |
12651
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
949 (let (font) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
950 (if (null frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
951 (let ((frames (frame-list))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
952 ;; Make this face italic in global-face-data. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
953 (make-face-italic face t noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
954 ;; Make this face italic in each frame. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
955 (while frames |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
956 (make-face-italic face (car frames) noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
957 (setq frames (cdr frames)))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
958 (setq face (internal-get-face face frame)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
959 (setq font (or (face-font face frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
960 (face-font face t))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
961 (if (listp font) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
962 (setq font nil)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
963 (setq font (or font |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
964 (face-font 'default frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
965 (cdr (assq 'font (frame-parameters frame))))) |
12651
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
966 (or (and font (make-face-italic-internal face frame font)) |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
967 ;; We failed to find an italic version of the font. |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
968 noerror |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
969 (error "No italic version of %S" font)))))) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
970 |
8109
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
971 (defun make-face-italic-internal (face frame font) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
972 (let (f2) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
973 (or (and (setq f2 (x-make-font-italic font)) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
974 (internal-try-face-font face f2 frame)) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
975 (and (setq f2 (x-make-font-oblique font)) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
976 (internal-try-face-font face f2 frame))))) |
2456 | 977 |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
978 (defun make-face-bold-italic (face &optional frame noerror) |
2456 | 979 "Make the font of the given face be bold and italic, if possible. |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
980 If NOERROR is non-nil, return nil on failure." |
2456 | 981 (interactive (list (read-face-name "Make which face bold-italic: "))) |
5199
b8b8063551e1
(make-face-unitalic, make-face-unbold, make-face-bold)
Richard M. Stallman <rms@gnu.org>
parents:
5092
diff
changeset
|
982 (if (and (eq frame t) (listp (face-font face t))) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
983 (set-face-font face '(bold italic) t) |
12651
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
984 (let (font) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
985 (if (null frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
986 (let ((frames (frame-list))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
987 ;; Make this face bold-italic in global-face-data. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
988 (make-face-bold-italic face t noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
989 ;; Make this face bold in each frame. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
990 (while frames |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
991 (make-face-bold-italic face (car frames) noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
992 (setq frames (cdr frames)))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
993 (setq face (internal-get-face face frame)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
994 (setq font (or (face-font face frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
995 (face-font face t))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
996 (if (listp font) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
997 (setq font nil)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
998 (setq font (or font |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
999 (face-font 'default frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1000 (cdr (assq 'font (frame-parameters frame))))) |
12651
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
1001 (or (and font (make-face-bold-italic-internal face frame font)) |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
1002 ;; We failed to find a bold italic version. |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
1003 noerror |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
1004 (error "No bold italic version of %S" font)))))) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1005 |
8109
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
1006 (defun make-face-bold-italic-internal (face frame font) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1007 (let (f2 f3) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1008 (or (and (setq f2 (x-make-font-italic font)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1009 (not (equal font f2)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1010 (setq f3 (x-make-font-bold f2)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1011 (not (equal f2 f3)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1012 (internal-try-face-font face f3 frame)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1013 (and (setq f2 (x-make-font-oblique font)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1014 (not (equal font f2)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1015 (setq f3 (x-make-font-bold f2)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1016 (not (equal f2 f3)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1017 (internal-try-face-font face f3 frame)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1018 (and (setq f2 (x-make-font-italic font)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1019 (not (equal font f2)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1020 (setq f3 (x-make-font-demibold f2)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1021 (not (equal f2 f3)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1022 (internal-try-face-font face f3 frame)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1023 (and (setq f2 (x-make-font-oblique font)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1024 (not (equal font f2)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1025 (setq f3 (x-make-font-demibold f2)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1026 (not (equal f2 f3)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1027 (internal-try-face-font face f3 frame))))) |
2456 | 1028 |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
1029 (defun make-face-unbold (face &optional frame noerror) |
2456 | 1030 "Make the font of the given face be non-bold, if possible. |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
1031 If NOERROR is non-nil, return nil on failure." |
2456 | 1032 (interactive (list (read-face-name "Make which face non-bold: "))) |
5199
b8b8063551e1
(make-face-unitalic, make-face-unbold, make-face-bold)
Richard M. Stallman <rms@gnu.org>
parents:
5092
diff
changeset
|
1033 (if (and (eq frame t) (listp (face-font face t))) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1034 (set-face-font face (if (memq 'italic (face-font face t)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1035 '(italic) nil) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1036 t) |
12651
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
1037 (let (font font1) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1038 (if (null frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1039 (let ((frames (frame-list))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1040 ;; Make this face unbold in global-face-data. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1041 (make-face-unbold face t noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1042 ;; Make this face unbold in each frame. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1043 (while frames |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1044 (make-face-unbold face (car frames) noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1045 (setq frames (cdr frames)))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1046 (setq face (internal-get-face face frame)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1047 (setq font1 (or (face-font face frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1048 (face-font face t))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1049 (if (listp font1) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1050 (setq font1 nil)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1051 (setq font1 (or font1 |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1052 (face-font 'default frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1053 (cdr (assq 'font (frame-parameters frame))))) |
8732
58d6dc80af5c
(make-face-unbold, make-face-unitalic, make-face-bold, make-face-italic,
Karl Heuer <kwzh@gnu.org>
parents:
8515
diff
changeset
|
1054 (setq font (and font1 (x-make-font-unbold font1))) |
12651
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
1055 (or (if font (internal-try-face-font face font frame)) |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
1056 noerror |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
1057 (error "No unbold version of %S" font1)))))) |
2456 | 1058 |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
1059 (defun make-face-unitalic (face &optional frame noerror) |
2456 | 1060 "Make the font of the given face be non-italic, if possible. |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
1061 If NOERROR is non-nil, return nil on failure." |
2456 | 1062 (interactive (list (read-face-name "Make which face non-italic: "))) |
5199
b8b8063551e1
(make-face-unitalic, make-face-unbold, make-face-bold)
Richard M. Stallman <rms@gnu.org>
parents:
5092
diff
changeset
|
1063 (if (and (eq frame t) (listp (face-font face t))) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1064 (set-face-font face (if (memq 'bold (face-font face t)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1065 '(bold) nil) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1066 t) |
12651
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
1067 (let (font font1) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1068 (if (null frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1069 (let ((frames (frame-list))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1070 ;; Make this face unitalic in global-face-data. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1071 (make-face-unitalic face t noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1072 ;; Make this face unitalic in each frame. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1073 (while frames |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1074 (make-face-unitalic face (car frames) noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1075 (setq frames (cdr frames)))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1076 (setq face (internal-get-face face frame)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1077 (setq font1 (or (face-font face frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1078 (face-font face t))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1079 (if (listp font1) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1080 (setq font1 nil)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1081 (setq font1 (or font1 |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1082 (face-font 'default frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1083 (cdr (assq 'font (frame-parameters frame))))) |
8732
58d6dc80af5c
(make-face-unbold, make-face-unitalic, make-face-bold, make-face-italic,
Karl Heuer <kwzh@gnu.org>
parents:
8515
diff
changeset
|
1084 (setq font (and font1 (x-make-font-unitalic font1))) |
12651
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
1085 (or (if font (internal-try-face-font face font frame)) |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
1086 noerror |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
1087 (error "No unitalic version of %S" font1)))))) |
2456 | 1088 |
4083
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1089 (defvar list-faces-sample-text |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1090 "abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ" |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1091 "*Text string to display as the sample text for `list-faces-display'.") |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1092 |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1093 ;; The name list-faces would be more consistent, but let's avoid a conflict |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1094 ;; with Lucid, which uses that name differently. |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1095 (defun list-faces-display () |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1096 "List all faces, using the same sample text in each. |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1097 The sample text is a string that comes from the variable |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1098 `list-faces-sample-text'. |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1099 |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1100 It is possible to give a particular face name different appearances in |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1101 different frames. This command shows the appearance in the |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1102 selected frame." |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1103 (interactive) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1104 (let ((faces (sort (face-list) (function string-lessp))) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1105 (face nil) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1106 (frame (selected-frame)) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1107 disp-frame window) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1108 (with-output-to-temp-buffer "*Faces*" |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1109 (save-excursion |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1110 (set-buffer standard-output) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1111 (setq truncate-lines t) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1112 (while faces |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1113 (setq face (car faces)) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1114 (setq faces (cdr faces)) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1115 (insert (format "%25s " (symbol-name face))) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1116 (let ((beg (point))) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1117 (insert list-faces-sample-text) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1118 (insert "\n") |
8107
0885b28decc6
(list-faces-display): Line up multiple lines in sample.
Richard M. Stallman <rms@gnu.org>
parents:
8011
diff
changeset
|
1119 (put-text-property beg (1- (point)) 'face face) |
0885b28decc6
(list-faces-display): Line up multiple lines in sample.
Richard M. Stallman <rms@gnu.org>
parents:
8011
diff
changeset
|
1120 ;; If the sample text has multiple lines, line up all of them. |
0885b28decc6
(list-faces-display): Line up multiple lines in sample.
Richard M. Stallman <rms@gnu.org>
parents:
8011
diff
changeset
|
1121 (goto-char beg) |
0885b28decc6
(list-faces-display): Line up multiple lines in sample.
Richard M. Stallman <rms@gnu.org>
parents:
8011
diff
changeset
|
1122 (forward-line 1) |
0885b28decc6
(list-faces-display): Line up multiple lines in sample.
Richard M. Stallman <rms@gnu.org>
parents:
8011
diff
changeset
|
1123 (while (not (eobp)) |
0885b28decc6
(list-faces-display): Line up multiple lines in sample.
Richard M. Stallman <rms@gnu.org>
parents:
8011
diff
changeset
|
1124 (insert " ") |
0885b28decc6
(list-faces-display): Line up multiple lines in sample.
Richard M. Stallman <rms@gnu.org>
parents:
8011
diff
changeset
|
1125 (forward-line 1)))) |
4083
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1126 (goto-char (point-min)))) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1127 ;; If the *Faces* buffer appears in a different frame, |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1128 ;; copy all the face definitions from FRAME, |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1129 ;; so that the display will reflect the frame that was selected. |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1130 (setq window (get-buffer-window (get-buffer "*Faces*") t)) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1131 (setq disp-frame (if window (window-frame window) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1132 (car (frame-list)))) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1133 (or (eq frame disp-frame) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1134 (let ((faces (face-list))) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1135 (while faces |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1136 (copy-face (car faces) (car faces) frame disp-frame) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1137 (setq faces (cdr faces))))))) |
12460
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
1138 |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
1139 (defun describe-face (face) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
1140 "Display the properties of face FACE." |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
1141 (interactive (list (read-face-name "Describe face: "))) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
1142 (with-output-to-temp-buffer "*Help*" |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
1143 (princ "Properties of face `") |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
1144 (princ (face-name face)) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
1145 (princ "':") (terpri) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
1146 (princ "Foreground: ") (princ (face-foreground face)) (terpri) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
1147 (princ "Background: ") (princ (face-background face)) (terpri) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
1148 (princ " Font: ") (princ (face-font face)) (terpri) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
1149 (princ "Underlined: ") (princ (if (face-underline-p face) "yes" "no")) (terpri) |
17560
1f4d7f741932
(describe-face): Add documentation.
Richard M. Stallman <rms@gnu.org>
parents:
17522
diff
changeset
|
1150 (princ " Stipple: ") (princ (or (face-stipple face) "none")) (terpri) |
1f4d7f741932
(describe-face): Add documentation.
Richard M. Stallman <rms@gnu.org>
parents:
17522
diff
changeset
|
1151 (terpri) |
1f4d7f741932
(describe-face): Add documentation.
Richard M. Stallman <rms@gnu.org>
parents:
17522
diff
changeset
|
1152 (princ "Documentation:") (terpri) |
18936
5aa5fcdc25c1
(face-documentation): Renamed from face-doc-string.
Richard M. Stallman <rms@gnu.org>
parents:
18919
diff
changeset
|
1153 (let ((doc (face-documentation face))) |
17560
1f4d7f741932
(describe-face): Add documentation.
Richard M. Stallman <rms@gnu.org>
parents:
17522
diff
changeset
|
1154 (if doc |
1f4d7f741932
(describe-face): Add documentation.
Richard M. Stallman <rms@gnu.org>
parents:
17522
diff
changeset
|
1155 (princ doc) |
1f4d7f741932
(describe-face): Add documentation.
Richard M. Stallman <rms@gnu.org>
parents:
17522
diff
changeset
|
1156 (princ "not documented as a face."))))) |
4083
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
1157 |
17522
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1158 ;;; Setting a face based on a SPEC. |
2764
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
1159 |
19098
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1160 (defun face-attr-match-p (face attrs &optional frame) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1161 (or frame (setq frame (selected-frame))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1162 (and (face-attr-match-1 face frame attrs ':inverse-video |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1163 'face-inverse-video-p) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1164 (if (face-inverse-video-p face frame) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1165 (and |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1166 (face-attr-match-1 face frame attrs |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1167 ':foreground 'face-background |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1168 (cdr (assq 'foreground-color |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1169 (frame-parameters frame)))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1170 (face-attr-match-1 face frame attrs |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1171 ':background 'face-foreground |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1172 (cdr (assq 'background-color |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1173 (frame-parameters frame))))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1174 (and |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1175 (face-attr-match-1 face frame attrs ':foreground 'face-foreground) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1176 (face-attr-match-1 face frame attrs ':background 'face-background))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1177 (face-attr-match-1 face frame attrs ':stipple 'face-stipple) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1178 (face-attr-match-1 face frame attrs ':bold 'face-bold-p) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1179 (face-attr-match-1 face frame attrs ':italic 'face-italic-p) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1180 (face-attr-match-1 face frame attrs ':underline 'face-underline-p) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1181 )) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1182 |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1183 (defun face-attr-match-1 (face frame plist property function |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1184 &optional defaultval) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1185 (while (and plist (not (eq (car plist) property))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1186 (setq plist (cdr (cdr plist)))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1187 (eq (funcall function face frame) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1188 (if plist |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1189 (nth 1 plist) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1190 (or defaultval |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1191 (funcall function 'default frame))))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1192 |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1193 (defun face-spec-match-p (face spec &optional frame) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1194 "Return t if FACE, on FRAME, matches what SPEC says it should look like." |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1195 (face-attr-match-p face (face-spec-choose spec frame) frame)) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1196 |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1197 (defun face-attr-construct (face &optional frame) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1198 "Return a defface-style attribute list for FACE, as it exists on FRAME." |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1199 (let (result) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1200 (if (face-inverse-video-p face frame) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1201 (progn |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1202 (setq result (cons ':inverse-video (cons t result))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1203 (or (face-attr-match-1 face frame nil |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1204 ':foreground 'face-background |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1205 (cdr (assq 'foreground-color |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1206 (frame-parameters frame)))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1207 (setq result (cons ':foreground |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1208 (cons (face-foreground face frame) result)))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1209 (or (face-attr-match-1 face frame nil |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1210 ':background 'face-foreground |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1211 (cdr (assq 'background-color |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1212 (frame-parameters frame)))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1213 (setq result (cons ':background |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1214 (cons (face-background face frame) result))))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1215 (if (face-foreground face frame) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1216 (setq result (cons ':foreground |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1217 (cons (face-foreground face frame) result)))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1218 (if (face-background face frame) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1219 (setq result (cons ':background |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1220 (cons (face-background face frame) result))))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1221 (if (face-stipple face frame) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1222 (setq result (cons ':stipple |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1223 (cons (face-stipple face frame) result)))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1224 (if (face-bold-p face frame) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1225 (setq result (cons ':bold |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1226 (cons (face-bold-p face frame) result)))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1227 (if (face-italic-p face frame) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1228 (setq result (cons ':italic |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1229 (cons (face-italic-p face frame) result)))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1230 (if (face-underline-p face frame) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1231 (setq result (cons ':underline |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1232 (cons (face-underline-p face frame) result)))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1233 result)) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1234 |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1235 ;; Choose the proper attributes for FRAME, out of SPEC. |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1236 (defun face-spec-choose (spec &optional frame) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1237 (or frame (setq frame (selected-frame))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1238 (let ((tail spec) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1239 result) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1240 (while tail |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1241 (let* ((entry (car tail)) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1242 (display (nth 0 entry)) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1243 (attrs (nth 1 entry))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1244 (setq tail (cdr tail)) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1245 (when (face-spec-set-match-display display frame) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1246 (setq result attrs tail nil)))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1247 result)) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1248 |
17522
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1249 (defun face-spec-set (face spec &optional frame) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1250 "Set FACE's face attributes according to the first matching entry in SPEC. |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1251 If optional FRAME is non-nil, set it for that frame only. |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1252 If it is nil, then apply SPEC to each frame individually. |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1253 See `defface' for information about SPEC." |
19098
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1254 (if frame |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1255 (let ((attrs (face-spec-choose spec frame))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1256 (when attrs |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1257 ;; If the font was set automatically, clear it out |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1258 ;; to allow it to be set it again. |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1259 (unless (face-font-explicit face frame) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1260 (set-face-font face nil frame)) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1261 (modify-face face nil nil nil nil nil nil frame) |
17522
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1262 (face-spec-set-1 face frame attrs ':foreground 'set-face-foreground) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1263 (face-spec-set-1 face frame attrs ':background 'set-face-background) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1264 (face-spec-set-1 face frame attrs ':stipple 'set-face-stipple) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1265 (face-spec-set-1 face frame attrs ':bold 'set-face-bold-p) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1266 (face-spec-set-1 face frame attrs ':italic 'set-face-italic-p) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1267 (face-spec-set-1 face frame attrs ':underline 'set-face-underline-p) |
17945
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
1268 (face-spec-set-1 face frame attrs ':inverse-video |
19098
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1269 'set-face-inverse-video-p))) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1270 (let ((frames (frame-list)) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1271 frame) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1272 (while frames |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1273 (setq frame (car frames) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1274 frames (cdr frames)) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1275 (face-spec-set face (or (get face 'saved-face) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1276 (get face 'face-defface-spec)) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1277 frame) |
51fdd58dc112
(face-attr-match-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19050
diff
changeset
|
1278 (face-spec-set face spec frame))))) |
17522
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1279 |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1280 (defun face-spec-set-1 (face frame plist property function) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1281 (while (and plist (not (eq (car plist) property))) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1282 (setq plist (cdr (cdr plist)))) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1283 (if plist |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1284 (funcall function face (nth 1 plist) frame))) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1285 |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1286 (defun face-spec-set-match-display (display frame) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1287 "Non-nil iff DISPLAY matches FRAME. |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1288 DISPLAY is part of a spec such as can be used in `defface'. |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1289 If FRAME is nil, the current FRAME is used." |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1290 (let* ((conjuncts display) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1291 conjunct req options |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1292 ;; t means we have succeeded against all |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1293 ;; the conjunts in DISPLAY that have been tested so far. |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1294 (match t)) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1295 (if (eq conjuncts t) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1296 (setq conjuncts nil)) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1297 (while (and conjuncts match) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1298 (setq conjunct (car conjuncts) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1299 conjuncts (cdr conjuncts) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1300 req (car conjunct) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1301 options (cdr conjunct) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1302 match (cond ((eq req 'type) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1303 (memq window-system options)) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1304 ((eq req 'class) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1305 (memq (frame-parameter frame 'display-type) options)) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1306 ((eq req 'background) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1307 (memq (frame-parameter frame 'background-mode) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1308 options)) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1309 (t |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1310 (error "Unknown req `%S' with options `%S'" |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1311 req options))))) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1312 match)) |
2456 | 1313 |
1314 ;; Like x-create-frame but also set up the faces. | |
1315 | |
1316 (defun x-create-frame-with-faces (&optional parameters) | |
11927
20eae371b3f0
(x-create-frame-with-faces): Read geometry resource
Karl Heuer <kwzh@gnu.org>
parents:
11850
diff
changeset
|
1317 ;; Read this frame's geometry resource, if it has an explicit name, |
20eae371b3f0
(x-create-frame-with-faces): Read geometry resource
Karl Heuer <kwzh@gnu.org>
parents:
11850
diff
changeset
|
1318 ;; and put the specs into PARAMETERS. |
20eae371b3f0
(x-create-frame-with-faces): Read geometry resource
Karl Heuer <kwzh@gnu.org>
parents:
11850
diff
changeset
|
1319 (let* ((name (or (cdr (assq 'name parameters)) |
12169
67f9dfb23d7c
(x-create-frame-with-faces): Don't use initial-frame-alist
Karl Heuer <kwzh@gnu.org>
parents:
12168
diff
changeset
|
1320 (cdr (assq 'name default-frame-alist)))) |
11927
20eae371b3f0
(x-create-frame-with-faces): Read geometry resource
Karl Heuer <kwzh@gnu.org>
parents:
11850
diff
changeset
|
1321 (x-resource-name name) |
17162 | 1322 (res-geometry (if name (x-get-resource "geometry" "Geometry")))) |
11927
20eae371b3f0
(x-create-frame-with-faces): Read geometry resource
Karl Heuer <kwzh@gnu.org>
parents:
11850
diff
changeset
|
1323 (if res-geometry |
17162 | 1324 (let ((parsed (x-parse-geometry res-geometry))) |
11927
20eae371b3f0
(x-create-frame-with-faces): Read geometry resource
Karl Heuer <kwzh@gnu.org>
parents:
11850
diff
changeset
|
1325 ;; If the resource specifies a position, |
20eae371b3f0
(x-create-frame-with-faces): Read geometry resource
Karl Heuer <kwzh@gnu.org>
parents:
11850
diff
changeset
|
1326 ;; call the position and size "user-specified". |
20eae371b3f0
(x-create-frame-with-faces): Read geometry resource
Karl Heuer <kwzh@gnu.org>
parents:
11850
diff
changeset
|
1327 (if (or (assq 'top parsed) (assq 'left parsed)) |
17162 | 1328 (setq parsed (append '((user-position . t) (user-size . t)) |
1329 parsed))) | |
12169
67f9dfb23d7c
(x-create-frame-with-faces): Don't use initial-frame-alist
Karl Heuer <kwzh@gnu.org>
parents:
12168
diff
changeset
|
1330 ;; Put the geometry parameters at the end. |
67f9dfb23d7c
(x-create-frame-with-faces): Don't use initial-frame-alist
Karl Heuer <kwzh@gnu.org>
parents:
12168
diff
changeset
|
1331 ;; Copy default-frame-alist so that they go after it. |
17162 | 1332 (setq parameters (append parameters default-frame-alist parsed))))) |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1333 (let (frame) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1334 (if (null global-face-data) |
17522
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1335 (progn |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1336 (setq frame (x-create-frame parameters)) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1337 (frame-set-background-mode frame)) |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1338 (let* ((visibility-spec (assq 'visibility parameters)) |
17522
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1339 success faces rest) |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1340 (setq frame (x-create-frame (cons '(visibility . nil) parameters))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1341 (unwind-protect |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1342 (progn |
17522
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1343 ;; Copy the face alist, copying the face vectors |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1344 ;; and emptying out their attributes. |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1345 (setq faces |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1346 (mapcar '(lambda (elt) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1347 (cons (car elt) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1348 (vector 'face |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1349 (face-name (cdr elt)) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1350 (face-id (cdr elt)) |
18890
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
1351 nil nil nil nil nil nil nil))) |
17522
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1352 global-face-data)) |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1353 (set-frame-face-alist frame faces) |
2456 | 1354 |
17522
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1355 ;; Handle the reverse-video frame parameter |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1356 ;; and X resource. x-create-frame does not handle this one. |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1357 (if (cdr (or (assq 'reverse parameters) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1358 (assq 'reverse default-frame-alist) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1359 (let ((resource (x-get-resource "reverseVideo" |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1360 "ReverseVideo"))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1361 (if resource |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1362 (cons nil (member (downcase resource) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1363 '("on" "true"))))))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1364 (let* ((params (frame-parameters frame)) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1365 (bg (cdr (assq 'foreground-color params))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1366 (fg (cdr (assq 'background-color params)))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1367 (modify-frame-parameters frame |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1368 (list (cons 'foreground-color fg) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1369 (cons 'background-color bg))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1370 (if (equal bg (cdr (assq 'border-color params))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1371 (modify-frame-parameters frame |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1372 (list (cons 'border-color fg)))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1373 (if (equal bg (cdr (assq 'mouse-color params))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1374 (modify-frame-parameters frame |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1375 (list (cons 'mouse-color fg)))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1376 (if (equal bg (cdr (assq 'cursor-color params))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1377 (modify-frame-parameters frame |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1378 (list (cons 'cursor-color fg)))))) |
17522
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1379 |
17950
4ef122a60b5a
(x-create-frame-with-faces): Don't call frame-set-background-mode
Richard M. Stallman <rms@gnu.org>
parents:
17947
diff
changeset
|
1380 (frame-set-background-mode frame) |
4ef122a60b5a
(x-create-frame-with-faces): Don't call frame-set-background-mode
Richard M. Stallman <rms@gnu.org>
parents:
17947
diff
changeset
|
1381 |
18635
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
1382 (face-set-after-frame-default frame) |
17522
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1383 |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1384 ;; Make the frame visible, if desired. |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1385 (if (null visibility-spec) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1386 (make-frame-visible frame) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1387 (modify-frame-parameters frame (list visibility-spec))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1388 (setq success t)) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1389 (or success |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1390 (delete-frame frame))))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1391 frame)) |
2456 | 1392 |
18635
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
1393 ;; Update a frame's faces after the frame font changes. |
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
1394 ;; This is called from modify-frame-parameters |
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
1395 ;; as well as from elsewhere in this file. |
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
1396 (defun face-set-after-frame-default (frame) |
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
1397 (let ((rest (frame-face-alist frame))) |
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
1398 (while rest |
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
1399 ;; Set up each face, first from the defface information, |
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
1400 ;; then the global face data, and then the X resources. |
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
1401 (let* ((face (car (car rest))) |
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
1402 (spec (or (get face 'saved-face) |
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
1403 (get face 'face-defface-spec))) |
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
1404 (global (cdr (assq face global-face-data))) |
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
1405 (local (cdr (car rest)))) |
18890
825fe2874454
(internal-facep): Length is now 10.
Richard M. Stallman <rms@gnu.org>
parents:
18635
diff
changeset
|
1406 (when spec |
18635
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
1407 (face-spec-set face spec frame)) |
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
1408 (face-fill-in face global frame) |
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
1409 (make-face-x-resource-internal local frame)) |
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
1410 (setq rest (cdr rest))))) |
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
1411 |
17522
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1412 (defcustom frame-background-mode nil |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1413 "*The brightness of the background. |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1414 Set this to the symbol dark if your background color is dark, light if |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1415 your background is light, or nil (default) if you want Emacs to |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1416 examine the brightness for you." |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1417 :group 'faces |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1418 :type '(choice (choice-item dark) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1419 (choice-item light) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1420 (choice-item :tag "default" nil))) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1421 |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1422 (defun frame-set-background-mode (frame) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1423 "Set up the `background-mode' and `display-type' frame parameters for FRAME." |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1424 (let ((bg-resource (x-get-resource ".backgroundMode" |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1425 "BackgroundMode")) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1426 (params (frame-parameters frame)) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1427 (bg-mode)) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1428 (setq bg-mode |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1429 (cond (frame-background-mode) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1430 (bg-resource (intern (downcase bg-resource))) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1431 ((< (apply '+ (x-color-values |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1432 (cdr (assq 'background-color params)) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1433 frame)) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1434 ;; Just looking at the screen, |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1435 ;; colors whose values add up to .6 of the white total |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1436 ;; still look dark to me. |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1437 (* (apply '+ (x-color-values "white" frame)) .6)) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1438 'dark) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1439 (t 'light))) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1440 (modify-frame-parameters frame |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1441 (list (cons 'background-mode bg-mode) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1442 (cons 'display-type |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1443 (cond ((x-display-color-p frame) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1444 'color) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1445 ((x-display-grayscale-p frame) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1446 'grayscale) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1447 (t 'mono))))))) |
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
1448 |
7019
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
1449 ;; Update a frame's faces when we change its default font. |
18635
d55ebf568fe7
(face-set-after-frame-default): New ubroutine,
Richard M. Stallman <rms@gnu.org>
parents:
18063
diff
changeset
|
1450 (defun frame-update-faces (frame) nil) |
7019
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
1451 |
10193
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1452 ;; Update the colors of FACE, after FRAME's own colors have been changed. |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1453 ;; This applies only to faces with global color specifications |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1454 ;; that are not simple constants. |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1455 (defun frame-update-face-colors (frame) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1456 (let ((faces global-face-data)) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1457 (while faces |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1458 (condition-case nil |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1459 (let* ((data (cdr (car faces))) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1460 (face (car (car faces))) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1461 (foreground (face-foreground data)) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1462 (background (face-background data))) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1463 ;; If the global spec is a specific color, |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1464 ;; which doesn't depend on the frame's attributes, |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1465 ;; we don't need to recalculate it now. |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1466 (or (listp foreground) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1467 (setq foreground nil)) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1468 (or (listp background) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1469 (setq background nil)) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1470 ;; If we are going to frob this face at all, |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1471 ;; reinitialize it first. |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1472 (if (or foreground background) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1473 (progn (set-face-foreground face nil frame) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1474 (set-face-background face nil frame))) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1475 (if foreground |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1476 (face-try-color-list 'set-face-foreground |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1477 face foreground frame)) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1478 (if background |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1479 (face-try-color-list 'set-face-background |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1480 face background frame))) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1481 (error nil)) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1482 (setq faces (cdr faces))))) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1483 |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1484 ;; Fill in the face FACE from frame-independent face data DATA. |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1485 ;; DATA should be the non-frame-specific ("global") face vector |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1486 ;; for the face. FACE should be a face name or face object. |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1487 ;; FRAME is the frame to act on; it must be an actual frame, not nil or t. |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1488 (defun face-fill-in (face data frame) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1489 (condition-case nil |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1490 (let ((foreground (face-foreground data)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1491 (background (face-background data)) |
11850
f9174d73e755
Put property on set-face-stipple, not set-stipple.
Karl Heuer <kwzh@gnu.org>
parents:
11464
diff
changeset
|
1492 (font (face-font data)) |
f9174d73e755
Put property on set-face-stipple, not set-stipple.
Karl Heuer <kwzh@gnu.org>
parents:
11464
diff
changeset
|
1493 (stipple (face-stipple data))) |
17945
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
1494 (if (face-underline-p data) |
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
1495 (set-face-underline-p face (face-underline-p data) frame)) |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1496 (if foreground |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1497 (face-try-color-list 'set-face-foreground |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1498 face foreground frame)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1499 (if background |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1500 (face-try-color-list 'set-face-background |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1501 face background frame)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1502 (if (listp font) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1503 (let ((bold (memq 'bold font)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1504 (italic (memq 'italic font))) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1505 (cond ((and bold italic) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1506 (make-face-bold-italic face frame)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1507 (bold |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1508 (make-face-bold face frame)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1509 (italic |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1510 (make-face-italic face frame)))) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1511 (if font |
11850
f9174d73e755
Put property on set-face-stipple, not set-stipple.
Karl Heuer <kwzh@gnu.org>
parents:
11464
diff
changeset
|
1512 (set-face-font face font frame))) |
f9174d73e755
Put property on set-face-stipple, not set-stipple.
Karl Heuer <kwzh@gnu.org>
parents:
11464
diff
changeset
|
1513 (if stipple |
f9174d73e755
Put property on set-face-stipple, not set-stipple.
Karl Heuer <kwzh@gnu.org>
parents:
11464
diff
changeset
|
1514 (set-face-stipple face stipple frame))) |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1515 (error nil))) |
2456 | 1516 |
10022
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1517 ;; Assuming COLOR is a valid color name, |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1518 ;; return t if it can be displayed on FRAME. |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1519 (defun face-color-supported-p (frame color background-p) |
13609
eb141cf52779
(face-color-supported-p): Return nil if no window system.
Richard M. Stallman <rms@gnu.org>
parents:
13432
diff
changeset
|
1520 (and window-system |
eb141cf52779
(face-color-supported-p): Return nil if no window system.
Richard M. Stallman <rms@gnu.org>
parents:
13432
diff
changeset
|
1521 (or (x-display-color-p frame) |
eb141cf52779
(face-color-supported-p): Return nil if no window system.
Richard M. Stallman <rms@gnu.org>
parents:
13432
diff
changeset
|
1522 ;; A black-and-white display can implement these. |
eb141cf52779
(face-color-supported-p): Return nil if no window system.
Richard M. Stallman <rms@gnu.org>
parents:
13432
diff
changeset
|
1523 (member color '("black" "white")) |
eb141cf52779
(face-color-supported-p): Return nil if no window system.
Richard M. Stallman <rms@gnu.org>
parents:
13432
diff
changeset
|
1524 ;; A black-and-white display can fake gray for background. |
eb141cf52779
(face-color-supported-p): Return nil if no window system.
Richard M. Stallman <rms@gnu.org>
parents:
13432
diff
changeset
|
1525 (and background-p |
eb141cf52779
(face-color-supported-p): Return nil if no window system.
Richard M. Stallman <rms@gnu.org>
parents:
13432
diff
changeset
|
1526 (face-color-gray-p color frame)) |
eb141cf52779
(face-color-supported-p): Return nil if no window system.
Richard M. Stallman <rms@gnu.org>
parents:
13432
diff
changeset
|
1527 ;; A grayscale display can implement colors that are gray (more or less). |
eb141cf52779
(face-color-supported-p): Return nil if no window system.
Richard M. Stallman <rms@gnu.org>
parents:
13432
diff
changeset
|
1528 (and (x-display-grayscale-p frame) |
eb141cf52779
(face-color-supported-p): Return nil if no window system.
Richard M. Stallman <rms@gnu.org>
parents:
13432
diff
changeset
|
1529 (face-color-gray-p color frame))))) |
10022
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1530 |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1531 ;; Use FUNCTION to store a color in FACE on FRAME. |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1532 ;; COLORS is either a single color or a list of colors. |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1533 ;; If it is a list, try the colors one by one until one of them |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1534 ;; succeeds. We signal an error only if all the colors failed. |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1535 ;; t as COLORS or as an element of COLORS means to invert the face. |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1536 ;; That can't fail, so any subsequent elements after the t are ignored. |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1537 (defun face-try-color-list (function face colors frame) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1538 (if (stringp colors) |
10022
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1539 (if (face-color-supported-p frame colors |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1540 (eq function 'set-face-background)) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1541 (funcall function face colors frame)) |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1542 (if (eq colors t) |
17945
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
1543 (set-face-inverse-video-p face t frame) |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1544 (let (done) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1545 (while (and colors (not done)) |
10375
8652c7b84a5f
(face-try-color-list): Treat `underline' as valid.
Richard M. Stallman <rms@gnu.org>
parents:
10193
diff
changeset
|
1546 (if (or (memq (car colors) '(t underline)) |
10022
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1547 (face-color-supported-p frame (car colors) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1548 (eq function 'set-face-background))) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1549 (if (cdr colors) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1550 ;; If there are more colors to try, catch errors |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1551 ;; and set `done' if we succeed. |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1552 (condition-case nil |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1553 (progn |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1554 (cond ((eq (car colors) t) |
17945
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
1555 (set-face-inverse-video-p face t frame)) |
10022
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1556 ((eq (car colors) 'underline) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1557 (set-face-underline-p face t frame)) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1558 (t |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1559 (funcall function face (car colors) frame))) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1560 (setq done t)) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1561 (error nil)) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1562 ;; If this is the last color, let the error get out if it fails. |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1563 ;; If it succeeds, we will exit anyway after this iteration. |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1564 (cond ((eq (car colors) t) |
17945
874de6432f05
(modify-face): Don't call make-face-unbold
Richard M. Stallman <rms@gnu.org>
parents:
17752
diff
changeset
|
1565 (set-face-inverse-video-p face t frame)) |
10022
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1566 ((eq (car colors) 'underline) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1567 (set-face-underline-p face t frame)) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1568 (t |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1569 (funcall function face (car colors) frame))))) |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1570 (setq colors (cdr colors))))))) |
2764
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
1571 |
17947
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1572 ;;; Make the standard faces. |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1573 ;;; The C code knows the default and modeline faces as faces 0 and 1, |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1574 ;;; so they must be the first two faces made. |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1575 (make-face 'default) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1576 (make-face 'modeline) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1577 (make-face 'highlight) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1578 |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1579 ;; These aren't really special in any way, but they're nice to have around. |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1580 |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1581 (make-face 'bold) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1582 (make-face 'italic) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1583 (make-face 'bold-italic) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1584 (make-face 'region) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1585 (make-face 'secondary-selection) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1586 (make-face 'underline) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1587 |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1588 (setq region-face (face-id 'region)) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1589 |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1590 ;; Specify how these faces look, and their documentation. |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1591 (let ((all '((bold "Use bold font." ((t (:bold t)))) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1592 (bold-italic "Use bold italic font." ((t (:bold t :italic t)))) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1593 (italic "Use italic font." ((t (:italic t)))) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1594 (underline "Underline text." ((t (:underline t)))) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1595 (default "Used for text not covered by other faces." ((t nil))) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1596 (highlight "Highlight text in some way." |
19114
5e2c2c7ca25e
Alternative colors for standard faces if dark background.
Richard M. Stallman <rms@gnu.org>
parents:
19098
diff
changeset
|
1597 ((((class color) (background light)) |
5e2c2c7ca25e
Alternative colors for standard faces if dark background.
Richard M. Stallman <rms@gnu.org>
parents:
19098
diff
changeset
|
1598 (:background "darkseagreen2")) |
5e2c2c7ca25e
Alternative colors for standard faces if dark background.
Richard M. Stallman <rms@gnu.org>
parents:
19098
diff
changeset
|
1599 (((class color) (background dark)) |
5e2c2c7ca25e
Alternative colors for standard faces if dark background.
Richard M. Stallman <rms@gnu.org>
parents:
19098
diff
changeset
|
1600 (:background "darkolivegreen")) |
17947
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1601 (t (:inverse-video t)))) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1602 (modeline "Used for displaying the modeline." |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1603 ((t (:inverse-video t)))) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1604 (region "Used for displaying the region." |
19114
5e2c2c7ca25e
Alternative colors for standard faces if dark background.
Richard M. Stallman <rms@gnu.org>
parents:
19098
diff
changeset
|
1605 ((((class color) (background dark)) |
5e2c2c7ca25e
Alternative colors for standard faces if dark background.
Richard M. Stallman <rms@gnu.org>
parents:
19098
diff
changeset
|
1606 (:background "blue")) |
5e2c2c7ca25e
Alternative colors for standard faces if dark background.
Richard M. Stallman <rms@gnu.org>
parents:
19098
diff
changeset
|
1607 (t (:background "gray")))) |
17947
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1608 (secondary-selection |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1609 "Used for displaying the secondary selection." |
19114
5e2c2c7ca25e
Alternative colors for standard faces if dark background.
Richard M. Stallman <rms@gnu.org>
parents:
19098
diff
changeset
|
1610 ((((class color) (background light)) |
5e2c2c7ca25e
Alternative colors for standard faces if dark background.
Richard M. Stallman <rms@gnu.org>
parents:
19098
diff
changeset
|
1611 (:background "paleturquoise")) |
5e2c2c7ca25e
Alternative colors for standard faces if dark background.
Richard M. Stallman <rms@gnu.org>
parents:
19098
diff
changeset
|
1612 (((class color) (background dark)) |
5e2c2c7ca25e
Alternative colors for standard faces if dark background.
Richard M. Stallman <rms@gnu.org>
parents:
19098
diff
changeset
|
1613 (:background "darkslateblue")) |
17947
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1614 (t (:inverse-video t)))))) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1615 entry symbol doc spec) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1616 (while all |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1617 (setq entry (car all) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1618 all (cdr all) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1619 symbol (nth 0 entry) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1620 doc (nth 1 entry) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1621 spec (nth 2 entry)) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1622 (put symbol 'face-documentation doc) |
057ea7eaaff3
Unconditionally create the standard faces at load time.
Richard M. Stallman <rms@gnu.org>
parents:
17945
diff
changeset
|
1623 (put symbol 'face-defface-spec spec))) |
2456 | 1624 |
2715
9caee9338229
* faces.el: Call internal-set-face-1, not internat-set-face-1.
Jim Blandy <jimb@redhat.com>
parents:
2714
diff
changeset
|
1625 (provide 'faces) |
9caee9338229
* faces.el: Call internal-set-face-1, not internat-set-face-1.
Jim Blandy <jimb@redhat.com>
parents:
2714
diff
changeset
|
1626 |
2456 | 1627 ;;; faces.el ends here |