Mercurial > hg > xemacs-beta
annotate lisp/cus-face.el @ 5617:b0d712bbc2a6
The "flush" face property.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2011-12-23 Didier Verna <didier@xemacs.org>
* faces.h (struct Lisp_Face): New 'flush slot.
* faces.h (struct face_cachel): New 'flush and 'flush_specified
flags.
* faces.h (WINDOW_FACE_CACHEL_FLUSH_P):
* faces.h (FACE_FLUSH_P): New macros.
* faces.c: Declare Qflush.
* lisp.h: Externalize it.
* faces.c (syms_of_faces): Define it.
* faces.c (vars_of_faces): Update built-in face specifiers.
* faces.c (complex_vars_of_faces): Update specifier fallbacks.
* faces.c (mark_face):
* faces.c (face_equal):
* faces.c (face_getprop):
* faces.c (face_putprop):
* faces.c (face_remprop):
* faces.c (face_plist):
* faces.c (reset_face):
* faces.c (update_face_inheritance_mapper):
* faces.c (Fmake_face):
* faces.c (update_face_cachel_data):
* faces.c (merge_face_cachel_data):
* faces.c (Fcopy_face):
* fontcolor.c (face_boolean_validate): Handle the flush property.
* redisplay.h (struct display_line): Rename 'default_findex slot to
clearer name 'clear_findex.
* redisplay.h (DISPLAY_LINE_INIT): Update accordingly.
* redisplay-output.c (compare_display_blocks):
* redisplay-output.c (output_display_line):
* redisplay-output.c (redisplay_output_window):
* redisplay.c (regenerate_window_extents_only_changed):
* redisplay.c (regenerate_window_incrementally): Update the
comparison tests between the current and desired display lines to
cope for different 'clear_findex values.
* redisplay.c (create_text_block): Initialize the display line's
'clear_findex slot to DEFAULT_INDEX. Record a new 'clear_findex
value when we encounter a newline character displayed in a flushed
face.
* redisplay.c (create_string_text_block): Record a new
'clear_findex value when we encounter a newline character
displayed in a flushed face.
lisp/ChangeLog addition:
2011-12-23 Didier Verna <didier@xemacs.org>
* cl-macs.el (face-flush-p): New defsetf.
* faces.el (set-face-property): Document the flush property.
* faces.el (face-flush-p): New function.
* faces.el (set-face-flush-p): New function.
* faces.el (face-equal):
* cus-face.el (custom-face-attributes):
* x-faces.el (x-init-face-from-resources):
* x-faces.el (make-face-x-resource-internal): Handle the flush
property.
| author | Didier Verna <didier@xemacs.org> |
|---|---|
| date | Fri, 23 Dec 2011 10:56:16 +0100 |
| parents | 91b3aa59f49b |
| children | 75ad4969a16d |
| 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) |
|
5617
b0d712bbc2a6
The "flush" face property.
Didier Verna <didier@xemacs.org>
parents:
5404
diff
changeset
|
129 (:flush (toggle :format "%[Flush%]: %v\n" |
|
b0d712bbc2a6
The "flush" face property.
Didier Verna <didier@xemacs.org>
parents:
5404
diff
changeset
|
130 :help-echo "\ |
|
b0d712bbc2a6
The "flush" face property.
Didier Verna <didier@xemacs.org>
parents:
5404
diff
changeset
|
131 Control whether the face should flush to the right border.") |
|
b0d712bbc2a6
The "flush" face property.
Didier Verna <didier@xemacs.org>
parents:
5404
diff
changeset
|
132 set-face-flush-p face-flush-p) |
| 3027 | 133 (:inherit |
| 134 (repeat :tag "Inherit" | |
| 135 :help-echo "List of faces to inherit attributes from." | |
| 136 (face :Tag "Face" default)) | |
| 137 ;; FSF 21.3 | |
| 138 ; ;; filter to make value suitable for customize | |
| 139 ; (lambda (real-value) | |
| 140 ; (cond ((or (null real-value) (eq real-value 'unspecified)) | |
| 141 ; nil) | |
| 142 ; ((symbolp real-value) | |
| 143 ; (list real-value)) | |
| 144 ; (t | |
| 145 ; real-value))) | |
| 146 ; ;; filter to make customized-value suitable for storing | |
| 147 ; (lambda (cus-value) | |
| 148 ; (if (and (consp cus-value) (null (cdr cus-value))) | |
| 149 ; (car cus-value) | |
| 150 ; cus-value)) | |
| 151 custom-set-face-inherit custom-face-inherit)) | |
| 444 | 152 "Alist of face attributes. |
| 428 | 153 |
| 444 | 154 The elements are lists of the form (KEY TYPE SET GET) where: |
| 155 KEY is a symbol identifying the attribute. | |
| 156 TYPE is a widget type for editing the attribute. | |
| 157 SET is a function for setting the attribute value. | |
| 158 GET is a function for getting the attribute value. | |
| 428 | 159 |
| 444 | 160 The SET function should take three arguments: the face to modify, the |
| 428 | 161 value of the attribute, and optionally the frame where the face should |
| 162 be changed. | |
| 163 | |
| 164 The GET function should take two arguments, the face to examine, and | |
| 444 | 165 optionally the frame where the face should be examined.") |
| 428 | 166 |
| 167 (defun face-custom-attributes-set (face frame tags &rest atts) | |
| 168 "For FACE on FRAME set the attributes [KEYWORD VALUE].... | |
| 169 Each keyword should be listed in `custom-face-attributes'. | |
| 170 | |
| 171 If FRAME is nil, set the default face." | |
| 172 (while atts | |
| 173 (let* ((name (nth 0 atts)) | |
| 174 (value (nth 1 atts)) | |
| 175 (fun (nth 2 (assq name custom-face-attributes)))) | |
| 176 (setq atts (cdr (cdr atts))) | |
| 177 (condition-case nil | |
| 178 (funcall fun face value frame tags) | |
| 179 (error nil))))) | |
| 180 | |
| 181 (defun face-custom-attributes-get (face frame) | |
| 182 "For FACE on FRAME get the attributes [KEYWORD VALUE].... | |
| 183 Each keyword should be listed in `custom-face-attributes'. | |
| 184 | |
| 185 If FRAME is nil, use the default face." | |
| 186 (condition-case nil | |
| 187 ;; Attempt to get `font.el' from w3. | |
| 188 (require 'font) | |
| 189 (error nil)) | |
| 190 (let ((atts custom-face-attributes) | |
| 191 att result get) | |
| 192 (while atts | |
| 193 (setq att (car atts) | |
| 194 atts (cdr atts) | |
| 195 get (nth 3 att)) | |
| 196 (condition-case nil | |
| 197 ;; This may fail if w3 doesn't exist. | |
| 198 (when get | |
| 199 (let ((answer (funcall get face frame))) | |
| 200 (unless (equal answer (funcall get 'default frame)) | |
| 201 (when (widget-apply (nth 1 att) :match answer) | |
| 202 (setq result (cons (nth 0 att) (cons answer result))))))) | |
| 203 (error nil))) | |
| 204 result)) | |
| 205 | |
| 206 (defsubst custom-face-get-spec (symbol) | |
| 207 (or (get symbol 'customized-face) | |
| 208 (get symbol 'saved-face) | |
| 209 (get symbol 'face-defface-spec) | |
| 210 ;; Attempt to construct it. | |
| 211 (list (list t (face-custom-attributes-get | |
| 212 symbol (selected-frame)))))) | |
| 213 | |
| 214 (defun custom-set-face-bold (face value &optional frame tags) | |
| 215 "Set the bold property of FACE to VALUE." | |
| 216 (if value | |
| 217 (make-face-bold face frame tags) | |
| 218 (make-face-unbold face frame tags))) | |
| 219 | |
| 220 ;; Really, we should get rid of these font.el dependencies... They | |
| 221 ;; are still presenting a problem with dumping the faces (font.el is | |
| 222 ;; too bloated for us to dump). I am thinking about hacking up | |
| 223 ;; font-like functionality myself for the sake of this file. It will | |
| 224 ;; probably be to-the-point and more efficient. | |
| 225 | |
| 226 (defun custom-face-bold (face &rest args) | |
| 227 "Return non-nil if the font of FACE is bold." | |
| 228 (let* ((font (apply 'face-font-name face args)) | |
| 229 ;; Gag | |
| 230 (fontobj (font-create-object font))) | |
| 231 (font-bold-p fontobj))) | |
| 232 | |
| 233 (defun custom-set-face-italic (face value &optional frame tags) | |
| 234 "Set the italic property of FACE to VALUE." | |
| 235 (if value | |
| 236 (make-face-italic face frame tags) | |
| 237 (make-face-unitalic face frame tags))) | |
| 238 | |
| 239 (defun custom-face-italic (face &rest args) | |
| 240 "Return non-nil if the font of FACE is italic." | |
| 241 (let* ((font (apply 'face-font-name face args)) | |
| 242 ;; Gag | |
| 243 (fontobj (font-create-object font))) | |
| 244 (font-italic-p fontobj))) | |
| 245 | |
| 246 (defun custom-face-background-pixmap (face &rest args) | |
| 247 "Return the name of the background pixmap file used for FACE." | |
| 3027 | 248 (let ((image (apply 'specifier-instance |
| 249 (face-background-pixmap face) args))) | |
| 444 | 250 (and image |
| 428 | 251 (image-instance-file-name image)))) |
| 252 | |
| 3027 | 253 (defun custom-set-face-inherit (face value &optional frame tags) |
| 254 "Set FACE to inherit its properties from another face." | |
| 255 (if (listp value) (setq value (car value))) ;; #### Temporary hack! | |
| 256 (if (find-face value) | |
| 257 (set-face-parent face value frame tags))) | |
| 258 | |
| 259 (defun custom-face-inherit (face &rest args) | |
| 260 "Return the value (instance) of the `inherit' property for FACE." | |
| 261 ;; #### Major, temporary hack! | |
| 262 (let ((spec (apply 'specifier-instantiator | |
| 263 (face-font face) args))) | |
| 264 (and spec (vector spec) (aref spec 0)))) | |
| 265 | |
| 707 | 266 ;; This consistently fails to dtrt |
| 267 ;;(defun custom-set-face-font-size (face size &optional locale tags) | |
| 268 ;; "Set the font of FACE to SIZE." | |
| 269 ;; ;; #### should this call have tags in it? | |
| 270 ;; (let* ((font (apply 'face-font-name face (list locale))) | |
| 271 ;; ;; Gag | |
| 272 ;; (fontobj (font-create-object font))) | |
| 273 ;; (set-font-size fontobj size) | |
| 274 ;; (apply 'font-set-face-font face fontobj locale tags))) | |
| 275 | |
| 276 ;; From Jan Vroonhof -- see faces.el | |
| 428 | 277 (defun custom-set-face-font-size (face size &optional locale tags) |
| 444 | 278 "Set the font of FACE to SIZE." |
| 707 | 279 (make-face-size face size locale tags)) |
| 428 | 280 |
| 281 (defun custom-face-font-size (face &rest args) | |
| 282 "Return the size of the font of FACE as a string." | |
| 283 (let* ((font (apply 'face-font-name face args)) | |
| 284 ;; Gag | |
| 285 (fontobj (font-create-object font))) | |
| 286 (format "%s" (font-size fontobj)))) | |
| 287 | |
| 707 | 288 ;; Jan suggests this may not dtrt |
| 289 ;;(defun custom-set-face-font-family (face family &optional locale tags) | |
| 290 ;; "Set the font of FACE to FAMILY." | |
| 291 ;; ;; #### should this call have tags in it? | |
| 292 ;; (let* ((font (apply 'face-font-name face (list locale))) | |
| 293 ;; ;; Gag | |
| 294 ;; (fontobj (font-create-object font))) | |
| 295 ;; (set-font-family fontobj family) | |
| 296 ;; (apply 'font-set-face-font face fontobj locale tags))) | |
| 297 | |
| 298 ;; From Jan Vroonhof -- see faces.el | |
| 428 | 299 (defun custom-set-face-font-family (face family &optional locale tags) |
| 300 "Set the font of FACE to FAMILY." | |
| 707 | 301 (make-face-family face family locale tags)) |
| 428 | 302 |
| 303 (defun custom-face-font-family (face &rest args) | |
| 304 "Return the name of the font family of FACE." | |
| 305 (let* ((font (apply 'face-font-name face args)) | |
| 306 ;; Gag | |
| 307 (fontobj (font-create-object font))) | |
| 308 (font-family fontobj))) | |
| 309 | |
| 310 ;;;###autoload | |
| 311 (defun custom-set-face-update-spec (face display plist) | |
| 312 "Customize the FACE for display types matching DISPLAY, merging | |
| 3918 | 313 in the new items from PLIST." |
| 428 | 314 (let ((spec (face-spec-update-all-matching (custom-face-get-spec face) |
| 315 display plist))) | |
| 316 (put face 'customized-face spec) | |
| 317 (face-spec-set face spec nil '(custom)))) | |
| 318 | |
| 319 ;;; Initializing. | |
| 320 | |
| 321 ;;;###autoload | |
| 322 (defun custom-set-faces (&rest args) | |
| 323 "Initialize faces according to user preferences. | |
| 324 This asociates the setting with the USER theme. | |
| 325 The arguments should be a list where each entry has the form: | |
| 326 | |
| 327 (FACE SPEC [NOW [COMMENT]]) | |
| 328 | |
| 329 SPEC will be stored as the saved value for FACE. If NOW is present | |
| 330 and non-nil, FACE will also be created according to SPEC. | |
| 331 COMMENT is a string comment about FACE. | |
| 332 | |
| 333 See `defface' for the format of SPEC." | |
| 334 (apply #'custom-theme-set-faces 'user args)) | |
| 335 | |
| 336 ;;;###autoload | |
| 337 (defun custom-theme-set-faces (theme &rest args) | |
| 338 "Initialize faces according to settings specified by args. | |
| 339 Records the settings as belonging to THEME. | |
| 340 | |
| 341 See `custom-set-faces' for a description of the arguments ARGS." | |
| 342 (custom-check-theme theme) | |
| 343 (let ((immediate (get theme 'theme-immediate))) | |
| 344 (while args | |
| 345 (let ((entry (car args))) | |
| 346 (if (listp entry) | |
| 347 (let ((face (nth 0 entry)) | |
| 348 (spec (nth 1 entry)) | |
| 349 (now (nth 2 entry)) | |
| 350 (comment (nth 3 entry))) | |
| 351 (put face 'saved-face spec) | |
| 352 (custom-push-theme 'theme-face face theme 'set spec) | |
| 353 (put face 'saved-face-comment comment) | |
| 354 (when (or now immediate) | |
| 355 (put face 'force-face (if now 'rogue 'immediate))) | |
| 356 (when (or now immediate (find-face face)) | |
| 357 (put face 'face-comment comment) | |
| 358 (unless (find-face face) | |
| 359 (make-empty-face face)) | |
| 360 (face-spec-set face spec nil '(custom))) | |
| 361 (setq args (cdr args))) | |
| 362 ;; Old format, a plist of FACE SPEC pairs. | |
| 363 (let ((face (nth 0 args)) | |
| 364 (spec (nth 1 args))) | |
| 365 (put face 'saved-face spec) | |
| 366 (custom-push-theme 'theme-face face theme 'set spec)) | |
| 367 (setq args (cdr (cdr args)))))))) | |
| 368 | |
| 369 ;;;###autoload | |
| 370 (defun custom-theme-face-value (face theme) | |
| 371 "Return spec of FACE in THEME if the THEME modifies the | |
| 372 FACE. Nil otherwise." | |
| 373 (car-safe (custom-theme-value theme (get face 'theme-face)))) | |
| 374 | |
| 375 (defun custom-theme-reset-internal-face (face to-theme) | |
| 376 (let ((spec (custom-theme-face-value face to-theme)) | |
| 377 was-in-theme) | |
| 378 (setq was-in-theme spec) | |
| 379 (setq spec (or spec (get face 'standard-value))) | |
| 380 (when spec | |
| 381 (put face 'save-face was-in-theme) | |
| 382 (when (or (get face 'force-face) (find-face face)) | |
| 383 (unless (find-face face) | |
| 384 (make-empty-face face)) | |
| 385 (face-spec-set face spec))) | |
| 386 spec)) | |
| 387 | |
| 388 ;;;###autoload | |
| 389 (defun custom-theme-reset-faces (theme &rest args) | |
| 390 "Reset the value of the face to values previously defined. | |
| 442 | 391 Associate this setting with THEME. |
| 428 | 392 |
| 393 ARGS is a list of lists of the form | |
| 394 | |
| 395 (face to-theme) | |
| 396 | |
| 397 This means reset face to its value in to-theme." | |
| 3842 | 398 (custom-check-theme theme) |
| 428 | 399 (mapc #'(lambda (arg) |
| 400 (apply #'custom-theme-reset-internal-face arg) | |
| 401 (custom-push-theme (car arg) 'theme-face theme 'reset (cadr arg))) | |
| 402 args)) | |
| 403 | |
| 404 ;;;###autoload | |
| 405 (defun custom-reset-faces (&rest args) | |
| 406 "Reset the value of the face to values previously defined. | |
| 442 | 407 Associate this setting with the 'user' theme. |
| 428 | 408 |
| 444 | 409 ARGS is defined as for `custom-theme-reset-faces'." |
| 428 | 410 (apply #'custom-theme-reset-faces 'user args)) |
| 411 | |
| 412 | |
| 413 ;;; The End. | |
| 414 | |
| 415 ;; cus-face.el ends here |