Mercurial > emacs
comparison lisp/faces.el @ 83401:03335deca80b
Merged from miles@gnu.org--gnu-2005 (patch 655)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-655
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-441
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Fri, 18 Nov 2005 14:53:14 +0000 |
parents | 693e794b57bf 68a08be78536 |
children | 69e184bbba16 |
comparison
equal
deleted
inserted
replaced
83400:03934708f1e9 | 83401:03335deca80b |
---|---|
355 "Return the value of FACE's ATTRIBUTE on FRAME. | 355 "Return the value of FACE's ATTRIBUTE on FRAME. |
356 If the optional argument FRAME is given, report on face FACE in that frame. | 356 If the optional argument FRAME is given, report on face FACE in that frame. |
357 If FRAME is t, report on the defaults for face FACE (for new frames). | 357 If FRAME is t, report on the defaults for face FACE (for new frames). |
358 If FRAME is omitted or nil, use the selected frame. | 358 If FRAME is omitted or nil, use the selected frame. |
359 | 359 |
360 If INHERIT is nil, only attributes directly defined by FACE are considered, | 360 If INHERIT is nil, only attributes directly defined by FACE are |
361 so the return value may be `unspecified', or a relative value. | 361 considered, so the return value may be `unspecified', |
362 `:ignore-defface', or a relative value. | |
362 If INHERIT is non-nil, FACE's definition of ATTRIBUTE is merged with the | 363 If INHERIT is non-nil, FACE's definition of ATTRIBUTE is merged with the |
363 faces specified by its `:inherit' attribute; however the return value | 364 faces specified by its `:inherit' attribute; however the return value |
364 may still be `unspecified' or relative. | 365 may still be relative. |
365 If INHERIT is a face or a list of faces, then the result is further merged | 366 If INHERIT is a face or a list of faces, then the result is further merged |
366 with that face (or faces), until it becomes specified and absolute. | 367 with that face (or faces), until it becomes specified and absolute. |
367 | 368 |
368 To ensure that the return value is always specified and absolute, use a | 369 To ensure that the return value is always specified and absolute, use a |
369 value of `default' for INHERIT; this will resolve any unspecified or | 370 value of `default' for INHERIT; this will resolve any unspecified or |
558 FRAME nil means change attributes on all frames. FRAME t means change | 559 FRAME nil means change attributes on all frames. FRAME t means change |
559 the default for new frames (this is done automatically each time an | 560 the default for new frames (this is done automatically each time an |
560 attribute is changed on all frames). | 561 attribute is changed on all frames). |
561 | 562 |
562 ARGS must come in pairs ATTRIBUTE VALUE. ATTRIBUTE must be a valid | 563 ARGS must come in pairs ATTRIBUTE VALUE. ATTRIBUTE must be a valid |
563 face attribute name. All attributes can be set to `unspecified'; | 564 face attribute name. |
564 this fact is not further mentioned below. | 565 |
566 Unless you're certain you know what you're doing, don't set an | |
567 attribute to `unspecified' . To make a face ignore the attribute | |
568 given in the defface spec, assign it the value `:ignore-defface'. | |
569 You can do this for any attribute; this fact is not further | |
570 mentioned below. | |
565 | 571 |
566 The following attributes are recognized: | 572 The following attributes are recognized: |
567 | 573 |
568 `:family' | 574 `:family' |
569 | 575 |
1017 (value (completing-read | 1023 (value (completing-read |
1018 (if default | 1024 (if default |
1019 (format "%s for face `%s' (default %s): " | 1025 (format "%s for face `%s' (default %s): " |
1020 name face default) | 1026 name face default) |
1021 (format "%s for face `%s': " name face)) | 1027 (format "%s for face `%s': " name face)) |
1022 completion-alist))) | 1028 completion-alist nil nil nil nil default))) |
1023 (if (equal value "") default value))) | 1029 (if (equal value "") default value))) |
1024 | 1030 |
1025 | 1031 |
1026 (defun face-read-integer (face default name) | 1032 (defun face-read-integer (face default name) |
1027 "Interactively read an integer face attribute value. | 1033 "Interactively read an integer face attribute value. |