Mercurial > hg > xemacs-beta
annotate lisp/cus-face.el @ 5284:d27c1ee1943b
Make the order of preloaded-file-list more sane.
lisp/ChangeLog addition:
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Tue, 12 Oct 2010 21:11:46 +0100 |
| parents | 5502045ec510 |
| children | 91b3aa59f49b |
| 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 | |
| 3027 | 12 ;;; Synched with: Not synched. |
| 13 | |
| 428 | 14 ;;; Commentary: |
| 15 ;; | |
| 16 ;; See `custom.el'. | |
| 17 | |
| 18 ;;; Code: | |
| 19 | |
| 771 | 20 ;; it is now safe to put the `provide' anywhere. if an error occurs while |
| 21 ;; loading, all provides (and fsets) will be undone. put it first to | |
| 22 ;; prevent require/provide loop with custom and cus-face. | |
| 23 (provide 'cus-face) | |
| 428 | 24 (require 'custom) |
| 25 | |
| 26 ;; To elude the warnings for font functions. | |
| 27 (eval-when-compile | |
| 28 (require 'font)) | |
| 29 | |
| 30 ;;; Declaring a face. | |
| 31 | |
| 32 ;;;###autoload | |
| 33 (defun custom-declare-face (face spec doc &rest args) | |
| 34 "Like `defface', but FACE is evaluated as a normal argument." | |
| 35 ;; (when (fboundp 'pureload) | |
| 36 ;; (error "Attempt to declare a face during dump")) | |
| 37 ;; #### should we possibly reset force-face here? | |
| 38 (unless (get face 'face-defface-spec) | |
| 39 (put face 'face-defface-spec spec) | |
| 40 (unless (find-face face) | |
| 41 ;; If the user has already created the face, respect that. | |
| 42 (let ((value (or (get face 'saved-face) spec)) | |
| 43 (frames (relevant-custom-frames)) | |
| 44 frame) | |
| 45 ;; Create global face. | |
| 46 (make-empty-face face) | |
| 47 (face-display-set face value nil '(custom)) | |
| 48 ;; Create frame local faces | |
| 49 (while frames | |
| 50 (setq frame (car frames) | |
| 51 frames (cdr frames)) | |
| 52 (face-display-set face value frame '(custom))) | |
| 53 (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
|
54 ;; 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
|
55 (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
|
56 (push (cons 'defface face) current-load-list) |
| 428 | 57 (when (and doc (null (face-doc-string face))) |
| 58 (set-face-doc-string face doc)) | |
| 59 (custom-handle-all-keywords face args 'custom-face) | |
| 60 (run-hooks 'custom-define-hook)) | |
| 61 face) | |
| 62 | |
| 63 ;;; Font Attributes. | |
| 64 | |
| 444 | 65 ;; Consider adding the stuff in the XML font model here. |
| 428 | 66 (defconst custom-face-attributes |
| 67 '((:foreground (color :tag "Foreground" | |
| 68 :value "" | |
| 69 :help-echo "Set foreground color.") | |
| 70 set-face-foreground face-foreground-name) | |
| 71 (:background (color :tag "Background" | |
| 72 :value "" | |
| 73 :help-echo "Set background color.") | |
| 74 set-face-background face-background-name) | |
| 75 (:size (editable-field :format "Size: %v" | |
| 76 :help-echo "\ | |
| 77 Text size (e.g. 9pt or 2mm).") | |
| 78 custom-set-face-font-size custom-face-font-size) | |
| 79 (:family (editable-field :format "Font Family: %v" | |
| 80 :help-echo "\ | |
| 81 Name of font family to use (e.g. times).") | |
| 82 custom-set-face-font-family custom-face-font-family) | |
| 83 (:background-pixmap (editable-field :format "Background pixmap: %v" | |
| 84 :help-echo "\ | |
| 85 Name of background pixmap file.") | |
| 86 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
|
87 (:background-placement (choice :tag "Background placement" :value relative |
|
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4535
diff
changeset
|
88 (const :tag "Relative" :value relative) |
|
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4535
diff
changeset
|
89 (const :tag "Absolute" :value absolute)) |
|
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4535
diff
changeset
|
90 set-face-background-placement |
|
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4535
diff
changeset
|
91 face-background-placement) |
|
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4535
diff
changeset
|
92 (:dim (toggle :format "%[Dim%]: %v\n" |
| 428 | 93 :help-echo "Control whether the text should be dimmed.") |
| 94 set-face-dim-p face-dim-p) | |
| 95 (:bold (toggle :format "%[Bold%]: %v\n" | |
| 96 :help-echo "Control whether a bold font should be used.") | |
| 97 custom-set-face-bold custom-face-bold) | |
| 98 (:italic (toggle :format "%[Italic%]: %v\n" | |
| 99 :help-echo "\ | |
| 100 Control whether an italic font should be used.") | |
| 101 custom-set-face-italic custom-face-italic) | |
| 102 (:underline (toggle :format "%[Underline%]: %v\n" | |
| 103 :help-echo "\ | |
| 104 Control whether the text should be underlined.") | |
| 105 set-face-underline-p face-underline-p) | |
| 106 (:strikethru (toggle :format "%[Strikethru%]: %v\n" | |
| 107 :help-echo "\ | |
| 108 Control whether the text should be strikethru.") | |
| 109 set-face-strikethru-p face-strikethru-p) | |
| 110 (:inverse-video (toggle :format "%[Inverse Video%]: %v\n" | |
| 111 :help-echo "\ | |
| 112 Control whether the text should be inverted. Works only on TTY-s") | |
| 3027 | 113 set-face-reverse-p face-reverse-p) |
| 114 (:inherit | |
| 115 (repeat :tag "Inherit" | |
| 116 :help-echo "List of faces to inherit attributes from." | |
| 117 (face :Tag "Face" default)) | |
| 118 ;; FSF 21.3 | |
| 119 ; ;; filter to make value suitable for customize | |
| 120 ; (lambda (real-value) | |
| 121 ; (cond ((or (null real-value) (eq real-value 'unspecified)) | |
| 122 ; nil) | |
| 123 ; ((symbolp real-value) | |
| 124 ; (list real-value)) | |
| 125 ; (t | |
| 126 ; real-value))) | |
| 127 ; ;; filter to make customized-value suitable for storing | |
| 128 ; (lambda (cus-value) | |
| 129 ; (if (and (consp cus-value) (null (cdr cus-value))) | |
| 130 ; (car cus-value) | |
| 131 ; cus-value)) | |
| 132 custom-set-face-inherit custom-face-inherit)) | |
| 444 | 133 "Alist of face attributes. |
| 428 | 134 |
| 444 | 135 The elements are lists of the form (KEY TYPE SET GET) where: |
| 136 KEY is a symbol identifying the attribute. | |
| 137 TYPE is a widget type for editing the attribute. | |
| 138 SET is a function for setting the attribute value. | |
| 139 GET is a function for getting the attribute value. | |
| 428 | 140 |
| 444 | 141 The SET function should take three arguments: the face to modify, the |
| 428 | 142 value of the attribute, and optionally the frame where the face should |
| 143 be changed. | |
| 144 | |
| 145 The GET function should take two arguments, the face to examine, and | |
| 444 | 146 optionally the frame where the face should be examined.") |
| 428 | 147 |
| 148 (defun face-custom-attributes-set (face frame tags &rest atts) | |
| 149 "For FACE on FRAME set the attributes [KEYWORD VALUE].... | |
| 150 Each keyword should be listed in `custom-face-attributes'. | |
| 151 | |
| 152 If FRAME is nil, set the default face." | |
| 153 (while atts | |
| 154 (let* ((name (nth 0 atts)) | |
| 155 (value (nth 1 atts)) | |
| 156 (fun (nth 2 (assq name custom-face-attributes)))) | |
| 157 (setq atts (cdr (cdr atts))) | |
| 158 (condition-case nil | |
| 159 (funcall fun face value frame tags) | |
| 160 (error nil))))) | |
| 161 | |
| 162 (defun face-custom-attributes-get (face frame) | |
| 163 "For FACE on FRAME get the attributes [KEYWORD VALUE].... | |
| 164 Each keyword should be listed in `custom-face-attributes'. | |
| 165 | |
| 166 If FRAME is nil, use the default face." | |
| 167 (condition-case nil | |
| 168 ;; Attempt to get `font.el' from w3. | |
| 169 (require 'font) | |
| 170 (error nil)) | |
| 171 (let ((atts custom-face-attributes) | |
| 172 att result get) | |
| 173 (while atts | |
| 174 (setq att (car atts) | |
| 175 atts (cdr atts) | |
| 176 get (nth 3 att)) | |
| 177 (condition-case nil | |
| 178 ;; This may fail if w3 doesn't exist. | |
| 179 (when get | |
| 180 (let ((answer (funcall get face frame))) | |
| 181 (unless (equal answer (funcall get 'default frame)) | |
| 182 (when (widget-apply (nth 1 att) :match answer) | |
| 183 (setq result (cons (nth 0 att) (cons answer result))))))) | |
| 184 (error nil))) | |
| 185 result)) | |
| 186 | |
| 187 (defsubst custom-face-get-spec (symbol) | |
| 188 (or (get symbol 'customized-face) | |
| 189 (get symbol 'saved-face) | |
| 190 (get symbol 'face-defface-spec) | |
| 191 ;; Attempt to construct it. | |
| 192 (list (list t (face-custom-attributes-get | |
| 193 symbol (selected-frame)))))) | |
| 194 | |
| 195 (defun custom-set-face-bold (face value &optional frame tags) | |
| 196 "Set the bold property of FACE to VALUE." | |
| 197 (if value | |
| 198 (make-face-bold face frame tags) | |
| 199 (make-face-unbold face frame tags))) | |
| 200 | |
| 201 ;; Really, we should get rid of these font.el dependencies... They | |
| 202 ;; are still presenting a problem with dumping the faces (font.el is | |
| 203 ;; too bloated for us to dump). I am thinking about hacking up | |
| 204 ;; font-like functionality myself for the sake of this file. It will | |
| 205 ;; probably be to-the-point and more efficient. | |
| 206 | |
| 207 (defun custom-face-bold (face &rest args) | |
| 208 "Return non-nil if the font of FACE is bold." | |
| 209 (let* ((font (apply 'face-font-name face args)) | |
| 210 ;; Gag | |
| 211 (fontobj (font-create-object font))) | |
| 212 (font-bold-p fontobj))) | |
| 213 | |
| 214 (defun custom-set-face-italic (face value &optional frame tags) | |
| 215 "Set the italic property of FACE to VALUE." | |
| 216 (if value | |
| 217 (make-face-italic face frame tags) | |
| 218 (make-face-unitalic face frame tags))) | |
| 219 | |
| 220 (defun custom-face-italic (face &rest args) | |
| 221 "Return non-nil if the font of FACE is italic." | |
| 222 (let* ((font (apply 'face-font-name face args)) | |
| 223 ;; Gag | |
| 224 (fontobj (font-create-object font))) | |
| 225 (font-italic-p fontobj))) | |
| 226 | |
| 227 (defun custom-face-background-pixmap (face &rest args) | |
| 228 "Return the name of the background pixmap file used for FACE." | |
| 3027 | 229 (let ((image (apply 'specifier-instance |
| 230 (face-background-pixmap face) args))) | |
| 444 | 231 (and image |
| 428 | 232 (image-instance-file-name image)))) |
| 233 | |
| 3027 | 234 (defun custom-set-face-inherit (face value &optional frame tags) |
| 235 "Set FACE to inherit its properties from another face." | |
| 236 (if (listp value) (setq value (car value))) ;; #### Temporary hack! | |
| 237 (if (find-face value) | |
| 238 (set-face-parent face value frame tags))) | |
| 239 | |
| 240 (defun custom-face-inherit (face &rest args) | |
| 241 "Return the value (instance) of the `inherit' property for FACE." | |
| 242 ;; #### Major, temporary hack! | |
| 243 (let ((spec (apply 'specifier-instantiator | |
| 244 (face-font face) args))) | |
| 245 (and spec (vector spec) (aref spec 0)))) | |
| 246 | |
| 707 | 247 ;; This consistently fails to dtrt |
| 248 ;;(defun custom-set-face-font-size (face size &optional locale tags) | |
| 249 ;; "Set the font of FACE to SIZE." | |
| 250 ;; ;; #### should this call have tags in it? | |
| 251 ;; (let* ((font (apply 'face-font-name face (list locale))) | |
| 252 ;; ;; Gag | |
| 253 ;; (fontobj (font-create-object font))) | |
| 254 ;; (set-font-size fontobj size) | |
| 255 ;; (apply 'font-set-face-font face fontobj locale tags))) | |
| 256 | |
| 257 ;; From Jan Vroonhof -- see faces.el | |
| 428 | 258 (defun custom-set-face-font-size (face size &optional locale tags) |
| 444 | 259 "Set the font of FACE to SIZE." |
| 707 | 260 (make-face-size face size locale tags)) |
| 428 | 261 |
| 262 (defun custom-face-font-size (face &rest args) | |
| 263 "Return the size of the font of FACE as a string." | |
| 264 (let* ((font (apply 'face-font-name face args)) | |
| 265 ;; Gag | |
| 266 (fontobj (font-create-object font))) | |
| 267 (format "%s" (font-size fontobj)))) | |
| 268 | |
| 707 | 269 ;; Jan suggests this may not dtrt |
| 270 ;;(defun custom-set-face-font-family (face family &optional locale tags) | |
| 271 ;; "Set the font of FACE to FAMILY." | |
| 272 ;; ;; #### should this call have tags in it? | |
| 273 ;; (let* ((font (apply 'face-font-name face (list locale))) | |
| 274 ;; ;; Gag | |
| 275 ;; (fontobj (font-create-object font))) | |
| 276 ;; (set-font-family fontobj family) | |
| 277 ;; (apply 'font-set-face-font face fontobj locale tags))) | |
| 278 | |
| 279 ;; From Jan Vroonhof -- see faces.el | |
| 428 | 280 (defun custom-set-face-font-family (face family &optional locale tags) |
| 281 "Set the font of FACE to FAMILY." | |
| 707 | 282 (make-face-family face family locale tags)) |
| 428 | 283 |
| 284 (defun custom-face-font-family (face &rest args) | |
| 285 "Return the name of the font family of FACE." | |
| 286 (let* ((font (apply 'face-font-name face args)) | |
| 287 ;; Gag | |
| 288 (fontobj (font-create-object font))) | |
| 289 (font-family fontobj))) | |
| 290 | |
| 291 ;;;###autoload | |
| 292 (defun custom-set-face-update-spec (face display plist) | |
| 293 "Customize the FACE for display types matching DISPLAY, merging | |
| 3918 | 294 in the new items from PLIST." |
| 428 | 295 (let ((spec (face-spec-update-all-matching (custom-face-get-spec face) |
| 296 display plist))) | |
| 297 (put face 'customized-face spec) | |
| 298 (face-spec-set face spec nil '(custom)))) | |
| 299 | |
| 300 ;;; Initializing. | |
| 301 | |
| 302 ;;;###autoload | |
| 303 (defun custom-set-faces (&rest args) | |
| 304 "Initialize faces according to user preferences. | |
| 305 This asociates the setting with the USER theme. | |
| 306 The arguments should be a list where each entry has the form: | |
| 307 | |
| 308 (FACE SPEC [NOW [COMMENT]]) | |
| 309 | |
| 310 SPEC will be stored as the saved value for FACE. If NOW is present | |
| 311 and non-nil, FACE will also be created according to SPEC. | |
| 312 COMMENT is a string comment about FACE. | |
| 313 | |
| 314 See `defface' for the format of SPEC." | |
| 315 (apply #'custom-theme-set-faces 'user args)) | |
| 316 | |
| 317 ;;;###autoload | |
| 318 (defun custom-theme-set-faces (theme &rest args) | |
| 319 "Initialize faces according to settings specified by args. | |
| 320 Records the settings as belonging to THEME. | |
| 321 | |
| 322 See `custom-set-faces' for a description of the arguments ARGS." | |
| 323 (custom-check-theme theme) | |
| 324 (let ((immediate (get theme 'theme-immediate))) | |
| 325 (while args | |
| 326 (let ((entry (car args))) | |
| 327 (if (listp entry) | |
| 328 (let ((face (nth 0 entry)) | |
| 329 (spec (nth 1 entry)) | |
| 330 (now (nth 2 entry)) | |
| 331 (comment (nth 3 entry))) | |
| 332 (put face 'saved-face spec) | |
| 333 (custom-push-theme 'theme-face face theme 'set spec) | |
| 334 (put face 'saved-face-comment comment) | |
| 335 (when (or now immediate) | |
| 336 (put face 'force-face (if now 'rogue 'immediate))) | |
| 337 (when (or now immediate (find-face face)) | |
| 338 (put face 'face-comment comment) | |
| 339 (unless (find-face face) | |
| 340 (make-empty-face face)) | |
| 341 (face-spec-set face spec nil '(custom))) | |
| 342 (setq args (cdr args))) | |
| 343 ;; Old format, a plist of FACE SPEC pairs. | |
| 344 (let ((face (nth 0 args)) | |
| 345 (spec (nth 1 args))) | |
| 346 (put face 'saved-face spec) | |
| 347 (custom-push-theme 'theme-face face theme 'set spec)) | |
| 348 (setq args (cdr (cdr args)))))))) | |
| 349 | |
| 350 ;;;###autoload | |
| 351 (defun custom-theme-face-value (face theme) | |
| 352 "Return spec of FACE in THEME if the THEME modifies the | |
| 353 FACE. Nil otherwise." | |
| 354 (car-safe (custom-theme-value theme (get face 'theme-face)))) | |
| 355 | |
| 356 (defun custom-theme-reset-internal-face (face to-theme) | |
| 357 (let ((spec (custom-theme-face-value face to-theme)) | |
| 358 was-in-theme) | |
| 359 (setq was-in-theme spec) | |
| 360 (setq spec (or spec (get face 'standard-value))) | |
| 361 (when spec | |
| 362 (put face 'save-face was-in-theme) | |
| 363 (when (or (get face 'force-face) (find-face face)) | |
| 364 (unless (find-face face) | |
| 365 (make-empty-face face)) | |
| 366 (face-spec-set face spec))) | |
| 367 spec)) | |
| 368 | |
| 369 ;;;###autoload | |
| 370 (defun custom-theme-reset-faces (theme &rest args) | |
| 371 "Reset the value of the face to values previously defined. | |
| 442 | 372 Associate this setting with THEME. |
| 428 | 373 |
| 374 ARGS is a list of lists of the form | |
| 375 | |
| 376 (face to-theme) | |
| 377 | |
| 378 This means reset face to its value in to-theme." | |
| 3842 | 379 (custom-check-theme theme) |
| 428 | 380 (mapc #'(lambda (arg) |
| 381 (apply #'custom-theme-reset-internal-face arg) | |
| 382 (custom-push-theme (car arg) 'theme-face theme 'reset (cadr arg))) | |
| 383 args)) | |
| 384 | |
| 385 ;;;###autoload | |
| 386 (defun custom-reset-faces (&rest args) | |
| 387 "Reset the value of the face to values previously defined. | |
| 442 | 388 Associate this setting with the 'user' theme. |
| 428 | 389 |
| 444 | 390 ARGS is defined as for `custom-theme-reset-faces'." |
| 428 | 391 (apply #'custom-theme-reset-faces 'user args)) |
| 392 | |
| 393 | |
| 394 ;;; The End. | |
| 395 | |
| 396 ;; cus-face.el ends here |