Mercurial > hg > xemacs-beta
annotate lisp/cus-face.el @ 5576:071b810ceb18
Declare labels as line where appropriate; use #'labels, not #'flet, tests.
lisp/ChangeLog addition:
2011-10-03 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (handle-pre-motion-command-current-command-is-motion):
Implement #'keysyms-equal with #'labels + (declare (inline ...)),
instead of abusing macrolet to the same end.
* specifier.el (let-specifier):
* mule/mule-cmds.el (describe-language-environment):
* mule/mule-cmds.el (set-language-environment-coding-systems):
* mule/mule-x-init.el (x-use-halfwidth-roman-font):
* faces.el (Face-frob-property):
* keymap.el (key-sequence-list-description):
* lisp-mode.el (construct-lisp-mode-menu):
* loadhist.el (unload-feature):
* mouse.el (default-mouse-track-check-for-activation):
Declare various labels inline in dumped files when that reduces
the size of the dumped image. Declaring labels inline is normally
only worthwhile for inner loops and so on, but it's reasonable
exercise of the related code to have these changes in core.
tests/ChangeLog addition:
2011-10-03 Aidan Kehoe <kehoea@parhasard.net>
* automated/case-tests.el (uni-mappings):
* automated/database-tests.el (delete-database-files):
* automated/hash-table-tests.el (iterations):
* automated/lisp-tests.el (test1):
* automated/lisp-tests.el (a):
* automated/lisp-tests.el (cl-floor):
* automated/lisp-tests.el (foo):
* automated/lisp-tests.el (list-nreverse):
* automated/lisp-tests.el (needs-lexical-context):
* automated/mule-tests.el (featurep):
* automated/os-tests.el (original-string):
* automated/os-tests.el (with):
* automated/symbol-tests.el (check-weak-list-unique):
Replace #'flet with #'labels where appropriate in these tests,
following my own advice on style in the docstrings of those
functions.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 03 Oct 2011 20:16:14 +0100 |
| parents | 91b3aa59f49b |
| children | b0d712bbc2a6 |
| rev | line source |
|---|---|
| 428 | 1 ;;; cus-face.el -- Support for Custom faces. |
| 2 ;; | |
| 3 ;; Copyright (C) 1996, 1997 Free Software Foundation, Inc. | |
|
5080
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4535
diff
changeset
|
4 ;; Copyright (C) 2010 Didier Verna |
| 428 | 5 ;; |
| 6 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> | |
| 7 ;; Maintainer: Hrvoje Niksic <hniksic@xemacs.org> | |
| 8 ;; Keywords: help, faces | |
| 9 ;; Version: 1.9960-x | |
| 10 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/ | |
| 11 | |
|
5404
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5080
diff
changeset
|
12 ;; This file is part of XEmacs. |
|
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5080
diff
changeset
|
13 |
|
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5080
diff
changeset
|
14 ;; XEmacs is free software: you can redistribute it and/or modify it |
|
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5080
diff
changeset
|
15 ;; under the terms of the GNU General Public License as published by the |
|
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5080
diff
changeset
|
16 ;; Free Software Foundation, either version 3 of the License, or (at your |
|
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5080
diff
changeset
|
17 ;; option) any later version. |
|
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5080
diff
changeset
|
18 |
|
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5080
diff
changeset
|
19 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
|
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5080
diff
changeset
|
20 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5080
diff
changeset
|
21 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5080
diff
changeset
|
22 ;; for more details. |
|
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5080
diff
changeset
|
23 |
|
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5080
diff
changeset
|
24 ;; You should have received a copy of the GNU General Public License |
|
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5080
diff
changeset
|
25 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
|
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5080
diff
changeset
|
26 |
| 3027 | 27 ;;; Synched with: Not synched. |
| 28 | |
| 428 | 29 ;;; Commentary: |
| 30 ;; | |
| 31 ;; See `custom.el'. | |
| 32 | |
| 33 ;;; Code: | |
| 34 | |
| 771 | 35 ;; it is now safe to put the `provide' anywhere. if an error occurs while |
| 36 ;; loading, all provides (and fsets) will be undone. put it first to | |
| 37 ;; prevent require/provide loop with custom and cus-face. | |
| 38 (provide 'cus-face) | |
| 428 | 39 (require 'custom) |
| 40 | |
| 41 ;; To elude the warnings for font functions. | |
| 42 (eval-when-compile | |
| 43 (require 'font)) | |
| 44 | |
| 45 ;;; Declaring a face. | |
| 46 | |
| 47 ;;;###autoload | |
| 48 (defun custom-declare-face (face spec doc &rest args) | |
| 49 "Like `defface', but FACE is evaluated as a normal argument." | |
| 50 ;; (when (fboundp 'pureload) | |
| 51 ;; (error "Attempt to declare a face during dump")) | |
| 52 ;; #### should we possibly reset force-face here? | |
| 53 (unless (get face 'face-defface-spec) | |
| 54 (put face 'face-defface-spec spec) | |
| 55 (unless (find-face face) | |
| 56 ;; If the user has already created the face, respect that. | |
| 57 (let ((value (or (get face 'saved-face) spec)) | |
| 58 (frames (relevant-custom-frames)) | |
| 59 frame) | |
| 60 ;; Create global face. | |
| 61 (make-empty-face face) | |
| 62 (face-display-set face value nil '(custom)) | |
| 63 ;; Create frame local faces | |
| 64 (while frames | |
| 65 (setq frame (car frames) | |
| 66 frames (cdr frames)) | |
| 67 (face-display-set face value frame '(custom))) | |
| 68 (init-face-from-resources face))) | |
|
4535
69a1eda3da06
Distinguish vars and functions in #'symbol-file, #'describe-{function,variable}
Aidan Kehoe <kehoea@parhasard.net>
parents:
3918
diff
changeset
|
69 ;; Don't record SPEC until we see it causes no errors. |
|
69a1eda3da06
Distinguish vars and functions in #'symbol-file, #'describe-{function,variable}
Aidan Kehoe <kehoea@parhasard.net>
parents:
3918
diff
changeset
|
70 (put face 'face-defface-spec spec) |
|
69a1eda3da06
Distinguish vars and functions in #'symbol-file, #'describe-{function,variable}
Aidan Kehoe <kehoea@parhasard.net>
parents:
3918
diff
changeset
|
71 (push (cons 'defface face) current-load-list) |
| 428 | 72 (when (and doc (null (face-doc-string face))) |
| 73 (set-face-doc-string face doc)) | |
| 74 (custom-handle-all-keywords face args 'custom-face) | |
| 75 (run-hooks 'custom-define-hook)) | |
| 76 face) | |
| 77 | |
| 78 ;;; Font Attributes. | |
| 79 | |
| 444 | 80 ;; Consider adding the stuff in the XML font model here. |
| 428 | 81 (defconst custom-face-attributes |
| 82 '((:foreground (color :tag "Foreground" | |
| 83 :value "" | |
| 84 :help-echo "Set foreground color.") | |
| 85 set-face-foreground face-foreground-name) | |
| 86 (:background (color :tag "Background" | |
| 87 :value "" | |
| 88 :help-echo "Set background color.") | |
| 89 set-face-background face-background-name) | |
| 90 (:size (editable-field :format "Size: %v" | |
| 91 :help-echo "\ | |
| 92 Text size (e.g. 9pt or 2mm).") | |
| 93 custom-set-face-font-size custom-face-font-size) | |
| 94 (:family (editable-field :format "Font Family: %v" | |
| 95 :help-echo "\ | |
| 96 Name of font family to use (e.g. times).") | |
| 97 custom-set-face-font-family custom-face-font-family) | |
| 98 (:background-pixmap (editable-field :format "Background pixmap: %v" | |
| 99 :help-echo "\ | |
| 100 Name of background pixmap file.") | |
| 101 set-face-background-pixmap custom-face-background-pixmap) | |
|
5080
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4535
diff
changeset
|
102 (:background-placement (choice :tag "Background placement" :value relative |
|
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4535
diff
changeset
|
103 (const :tag "Relative" :value relative) |
|
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4535
diff
changeset
|
104 (const :tag "Absolute" :value absolute)) |
|
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4535
diff
changeset
|
105 set-face-background-placement |
|
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4535
diff
changeset
|
106 face-background-placement) |
|
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4535
diff
changeset
|
107 (:dim (toggle :format "%[Dim%]: %v\n" |
| 428 | 108 :help-echo "Control whether the text should be dimmed.") |
| 109 set-face-dim-p face-dim-p) | |
| 110 (:bold (toggle :format "%[Bold%]: %v\n" | |
| 111 :help-echo "Control whether a bold font should be used.") | |
| 112 custom-set-face-bold custom-face-bold) | |
| 113 (:italic (toggle :format "%[Italic%]: %v\n" | |
| 114 :help-echo "\ | |
| 115 Control whether an italic font should be used.") | |
| 116 custom-set-face-italic custom-face-italic) | |
| 117 (:underline (toggle :format "%[Underline%]: %v\n" | |
| 118 :help-echo "\ | |
| 119 Control whether the text should be underlined.") | |
| 120 set-face-underline-p face-underline-p) | |
| 121 (:strikethru (toggle :format "%[Strikethru%]: %v\n" | |
| 122 :help-echo "\ | |
| 123 Control whether the text should be strikethru.") | |
| 124 set-face-strikethru-p face-strikethru-p) | |
| 125 (:inverse-video (toggle :format "%[Inverse Video%]: %v\n" | |
| 126 :help-echo "\ | |
| 127 Control whether the text should be inverted. Works only on TTY-s") | |
| 3027 | 128 set-face-reverse-p face-reverse-p) |
| 129 (:inherit | |
| 130 (repeat :tag "Inherit" | |
| 131 :help-echo "List of faces to inherit attributes from." | |
| 132 (face :Tag "Face" default)) | |
| 133 ;; FSF 21.3 | |
| 134 ; ;; filter to make value suitable for customize | |
| 135 ; (lambda (real-value) | |
| 136 ; (cond ((or (null real-value) (eq real-value 'unspecified)) | |
| 137 ; nil) | |
| 138 ; ((symbolp real-value) | |
| 139 ; (list real-value)) | |
| 140 ; (t | |
| 141 ; real-value))) | |
| 142 ; ;; filter to make customized-value suitable for storing | |
| 143 ; (lambda (cus-value) | |
| 144 ; (if (and (consp cus-value) (null (cdr cus-value))) | |
| 145 ; (car cus-value) | |
| 146 ; cus-value)) | |
| 147 custom-set-face-inherit custom-face-inherit)) | |
| 444 | 148 "Alist of face attributes. |
| 428 | 149 |
| 444 | 150 The elements are lists of the form (KEY TYPE SET GET) where: |
| 151 KEY is a symbol identifying the attribute. | |
| 152 TYPE is a widget type for editing the attribute. | |
| 153 SET is a function for setting the attribute value. | |
| 154 GET is a function for getting the attribute value. | |
| 428 | 155 |
| 444 | 156 The SET function should take three arguments: the face to modify, the |
| 428 | 157 value of the attribute, and optionally the frame where the face should |
| 158 be changed. | |
| 159 | |
| 160 The GET function should take two arguments, the face to examine, and | |
| 444 | 161 optionally the frame where the face should be examined.") |
| 428 | 162 |
| 163 (defun face-custom-attributes-set (face frame tags &rest atts) | |
| 164 "For FACE on FRAME set the attributes [KEYWORD VALUE].... | |
| 165 Each keyword should be listed in `custom-face-attributes'. | |
| 166 | |
| 167 If FRAME is nil, set the default face." | |
| 168 (while atts | |
| 169 (let* ((name (nth 0 atts)) | |
| 170 (value (nth 1 atts)) | |
| 171 (fun (nth 2 (assq name custom-face-attributes)))) | |
| 172 (setq atts (cdr (cdr atts))) | |
| 173 (condition-case nil | |
| 174 (funcall fun face value frame tags) | |
| 175 (error nil))))) | |
| 176 | |
| 177 (defun face-custom-attributes-get (face frame) | |
| 178 "For FACE on FRAME get the attributes [KEYWORD VALUE].... | |
| 179 Each keyword should be listed in `custom-face-attributes'. | |
| 180 | |
| 181 If FRAME is nil, use the default face." | |
| 182 (condition-case nil | |
| 183 ;; Attempt to get `font.el' from w3. | |
| 184 (require 'font) | |
| 185 (error nil)) | |
| 186 (let ((atts custom-face-attributes) | |
| 187 att result get) | |
| 188 (while atts | |
| 189 (setq att (car atts) | |
| 190 atts (cdr atts) | |
| 191 get (nth 3 att)) | |
| 192 (condition-case nil | |
| 193 ;; This may fail if w3 doesn't exist. | |
| 194 (when get | |
| 195 (let ((answer (funcall get face frame))) | |
| 196 (unless (equal answer (funcall get 'default frame)) | |
| 197 (when (widget-apply (nth 1 att) :match answer) | |
| 198 (setq result (cons (nth 0 att) (cons answer result))))))) | |
| 199 (error nil))) | |
| 200 result)) | |
| 201 | |
| 202 (defsubst custom-face-get-spec (symbol) | |
| 203 (or (get symbol 'customized-face) | |
| 204 (get symbol 'saved-face) | |
| 205 (get symbol 'face-defface-spec) | |
| 206 ;; Attempt to construct it. | |
| 207 (list (list t (face-custom-attributes-get | |
| 208 symbol (selected-frame)))))) | |
| 209 | |
| 210 (defun custom-set-face-bold (face value &optional frame tags) | |
| 211 "Set the bold property of FACE to VALUE." | |
| 212 (if value | |
| 213 (make-face-bold face frame tags) | |
| 214 (make-face-unbold face frame tags))) | |
| 215 | |
| 216 ;; Really, we should get rid of these font.el dependencies... They | |
| 217 ;; are still presenting a problem with dumping the faces (font.el is | |
| 218 ;; too bloated for us to dump). I am thinking about hacking up | |
| 219 ;; font-like functionality myself for the sake of this file. It will | |
| 220 ;; probably be to-the-point and more efficient. | |
| 221 | |
| 222 (defun custom-face-bold (face &rest args) | |
| 223 "Return non-nil if the font of FACE is bold." | |
| 224 (let* ((font (apply 'face-font-name face args)) | |
| 225 ;; Gag | |
| 226 (fontobj (font-create-object font))) | |
| 227 (font-bold-p fontobj))) | |
| 228 | |
| 229 (defun custom-set-face-italic (face value &optional frame tags) | |
| 230 "Set the italic property of FACE to VALUE." | |
| 231 (if value | |
| 232 (make-face-italic face frame tags) | |
| 233 (make-face-unitalic face frame tags))) | |
| 234 | |
| 235 (defun custom-face-italic (face &rest args) | |
| 236 "Return non-nil if the font of FACE is italic." | |
| 237 (let* ((font (apply 'face-font-name face args)) | |
| 238 ;; Gag | |
| 239 (fontobj (font-create-object font))) | |
| 240 (font-italic-p fontobj))) | |
| 241 | |
| 242 (defun custom-face-background-pixmap (face &rest args) | |
| 243 "Return the name of the background pixmap file used for FACE." | |
| 3027 | 244 (let ((image (apply 'specifier-instance |
| 245 (face-background-pixmap face) args))) | |
| 444 | 246 (and image |
| 428 | 247 (image-instance-file-name image)))) |
| 248 | |
| 3027 | 249 (defun custom-set-face-inherit (face value &optional frame tags) |
| 250 "Set FACE to inherit its properties from another face." | |
| 251 (if (listp value) (setq value (car value))) ;; #### Temporary hack! | |
| 252 (if (find-face value) | |
| 253 (set-face-parent face value frame tags))) | |
| 254 | |
| 255 (defun custom-face-inherit (face &rest args) | |
| 256 "Return the value (instance) of the `inherit' property for FACE." | |
| 257 ;; #### Major, temporary hack! | |
| 258 (let ((spec (apply 'specifier-instantiator | |
| 259 (face-font face) args))) | |
| 260 (and spec (vector spec) (aref spec 0)))) | |
| 261 | |
| 707 | 262 ;; This consistently fails to dtrt |
| 263 ;;(defun custom-set-face-font-size (face size &optional locale tags) | |
| 264 ;; "Set the font of FACE to SIZE." | |
| 265 ;; ;; #### should this call have tags in it? | |
| 266 ;; (let* ((font (apply 'face-font-name face (list locale))) | |
| 267 ;; ;; Gag | |
| 268 ;; (fontobj (font-create-object font))) | |
| 269 ;; (set-font-size fontobj size) | |
| 270 ;; (apply 'font-set-face-font face fontobj locale tags))) | |
| 271 | |
| 272 ;; From Jan Vroonhof -- see faces.el | |
| 428 | 273 (defun custom-set-face-font-size (face size &optional locale tags) |
| 444 | 274 "Set the font of FACE to SIZE." |
| 707 | 275 (make-face-size face size locale tags)) |
| 428 | 276 |
| 277 (defun custom-face-font-size (face &rest args) | |
| 278 "Return the size of the font of FACE as a string." | |
| 279 (let* ((font (apply 'face-font-name face args)) | |
| 280 ;; Gag | |
| 281 (fontobj (font-create-object font))) | |
| 282 (format "%s" (font-size fontobj)))) | |
| 283 | |
| 707 | 284 ;; Jan suggests this may not dtrt |
| 285 ;;(defun custom-set-face-font-family (face family &optional locale tags) | |
| 286 ;; "Set the font of FACE to FAMILY." | |
| 287 ;; ;; #### should this call have tags in it? | |
| 288 ;; (let* ((font (apply 'face-font-name face (list locale))) | |
| 289 ;; ;; Gag | |
| 290 ;; (fontobj (font-create-object font))) | |
| 291 ;; (set-font-family fontobj family) | |
| 292 ;; (apply 'font-set-face-font face fontobj locale tags))) | |
| 293 | |
| 294 ;; From Jan Vroonhof -- see faces.el | |
| 428 | 295 (defun custom-set-face-font-family (face family &optional locale tags) |
| 296 "Set the font of FACE to FAMILY." | |
| 707 | 297 (make-face-family face family locale tags)) |
| 428 | 298 |
| 299 (defun custom-face-font-family (face &rest args) | |
| 300 "Return the name of the font family of FACE." | |
| 301 (let* ((font (apply 'face-font-name face args)) | |
| 302 ;; Gag | |
| 303 (fontobj (font-create-object font))) | |
| 304 (font-family fontobj))) | |
| 305 | |
| 306 ;;;###autoload | |
| 307 (defun custom-set-face-update-spec (face display plist) | |
| 308 "Customize the FACE for display types matching DISPLAY, merging | |
| 3918 | 309 in the new items from PLIST." |
| 428 | 310 (let ((spec (face-spec-update-all-matching (custom-face-get-spec face) |
| 311 display plist))) | |
| 312 (put face 'customized-face spec) | |
| 313 (face-spec-set face spec nil '(custom)))) | |
| 314 | |
| 315 ;;; Initializing. | |
| 316 | |
| 317 ;;;###autoload | |
| 318 (defun custom-set-faces (&rest args) | |
| 319 "Initialize faces according to user preferences. | |
| 320 This asociates the setting with the USER theme. | |
| 321 The arguments should be a list where each entry has the form: | |
| 322 | |
| 323 (FACE SPEC [NOW [COMMENT]]) | |
| 324 | |
| 325 SPEC will be stored as the saved value for FACE. If NOW is present | |
| 326 and non-nil, FACE will also be created according to SPEC. | |
| 327 COMMENT is a string comment about FACE. | |
| 328 | |
| 329 See `defface' for the format of SPEC." | |
| 330 (apply #'custom-theme-set-faces 'user args)) | |
| 331 | |
| 332 ;;;###autoload | |
| 333 (defun custom-theme-set-faces (theme &rest args) | |
| 334 "Initialize faces according to settings specified by args. | |
| 335 Records the settings as belonging to THEME. | |
| 336 | |
| 337 See `custom-set-faces' for a description of the arguments ARGS." | |
| 338 (custom-check-theme theme) | |
| 339 (let ((immediate (get theme 'theme-immediate))) | |
| 340 (while args | |
| 341 (let ((entry (car args))) | |
| 342 (if (listp entry) | |
| 343 (let ((face (nth 0 entry)) | |
| 344 (spec (nth 1 entry)) | |
| 345 (now (nth 2 entry)) | |
| 346 (comment (nth 3 entry))) | |
| 347 (put face 'saved-face spec) | |
| 348 (custom-push-theme 'theme-face face theme 'set spec) | |
| 349 (put face 'saved-face-comment comment) | |
| 350 (when (or now immediate) | |
| 351 (put face 'force-face (if now 'rogue 'immediate))) | |
| 352 (when (or now immediate (find-face face)) | |
| 353 (put face 'face-comment comment) | |
| 354 (unless (find-face face) | |
| 355 (make-empty-face face)) | |
| 356 (face-spec-set face spec nil '(custom))) | |
| 357 (setq args (cdr args))) | |
| 358 ;; Old format, a plist of FACE SPEC pairs. | |
| 359 (let ((face (nth 0 args)) | |
| 360 (spec (nth 1 args))) | |
| 361 (put face 'saved-face spec) | |
| 362 (custom-push-theme 'theme-face face theme 'set spec)) | |
| 363 (setq args (cdr (cdr args)))))))) | |
| 364 | |
| 365 ;;;###autoload | |
| 366 (defun custom-theme-face-value (face theme) | |
| 367 "Return spec of FACE in THEME if the THEME modifies the | |
| 368 FACE. Nil otherwise." | |
| 369 (car-safe (custom-theme-value theme (get face 'theme-face)))) | |
| 370 | |
| 371 (defun custom-theme-reset-internal-face (face to-theme) | |
| 372 (let ((spec (custom-theme-face-value face to-theme)) | |
| 373 was-in-theme) | |
| 374 (setq was-in-theme spec) | |
| 375 (setq spec (or spec (get face 'standard-value))) | |
| 376 (when spec | |
| 377 (put face 'save-face was-in-theme) | |
| 378 (when (or (get face 'force-face) (find-face face)) | |
| 379 (unless (find-face face) | |
| 380 (make-empty-face face)) | |
| 381 (face-spec-set face spec))) | |
| 382 spec)) | |
| 383 | |
| 384 ;;;###autoload | |
| 385 (defun custom-theme-reset-faces (theme &rest args) | |
| 386 "Reset the value of the face to values previously defined. | |
| 442 | 387 Associate this setting with THEME. |
| 428 | 388 |
| 389 ARGS is a list of lists of the form | |
| 390 | |
| 391 (face to-theme) | |
| 392 | |
| 393 This means reset face to its value in to-theme." | |
| 3842 | 394 (custom-check-theme theme) |
| 428 | 395 (mapc #'(lambda (arg) |
| 396 (apply #'custom-theme-reset-internal-face arg) | |
| 397 (custom-push-theme (car arg) 'theme-face theme 'reset (cadr arg))) | |
| 398 args)) | |
| 399 | |
| 400 ;;;###autoload | |
| 401 (defun custom-reset-faces (&rest args) | |
| 402 "Reset the value of the face to values previously defined. | |
| 442 | 403 Associate this setting with the 'user' theme. |
| 428 | 404 |
| 444 | 405 ARGS is defined as for `custom-theme-reset-faces'." |
| 428 | 406 (apply #'custom-theme-reset-faces 'user args)) |
| 407 | |
| 408 | |
| 409 ;;; The End. | |
| 410 | |
| 411 ;; cus-face.el ends here |