diff options
| author | Dan Nicolaescu | 2005-11-05 07:29:45 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2005-11-05 07:29:45 +0000 |
| commit | d60b49ac4e4ef6cbb9752b21284407f352d2bd9e (patch) | |
| tree | 66a3d8e66bae82ef8bd14f13b2d7c861b825a5eb /lisp/faces.el | |
| parent | 6b19bd8250c2975fbf95c90950a1003defb39e55 (diff) | |
| download | emacs-d60b49ac4e4ef6cbb9752b21284407f352d2bd9e.tar.gz emacs-d60b49ac4e4ef6cbb9752b21284407f352d2bd9e.zip | |
* font-lock.el: Don't deal with font-lock-face-attributes here,
move the code ...
* startup.el (command-line): ... here. Use face-spec-set instead
of custom-declare-face.
* faces.el (face-spec-set): Reset the face if spec is not nil.
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 8ca9e40d7d2..bcbda67b87b 100644 --- a/lisp/faces.el +++ b/lisp/faces.el | |||
| @@ -1448,7 +1448,7 @@ FRAME is the frame whose frame-local face is set. FRAME nil means | |||
| 1448 | do it on all frames. See `defface' for information about SPEC. | 1448 | do it on all frames. See `defface' for information about SPEC. |
| 1449 | If SPEC is nil, do nothing." | 1449 | If SPEC is nil, do nothing." |
| 1450 | (let ((attrs (face-spec-choose spec frame))) | 1450 | (let ((attrs (face-spec-choose spec frame))) |
| 1451 | (when attrs | 1451 | (when spec |
| 1452 | (face-spec-reset-face face frame)) | 1452 | (face-spec-reset-face face frame)) |
| 1453 | (while attrs | 1453 | (while attrs |
| 1454 | (let ((attribute (car attrs)) | 1454 | (let ((attribute (car attrs)) |