diff options
| author | Karoly Lorentey <[email protected]> | 2006-07-14 05:56:32 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2006-07-14 05:56:32 +0000 |
| commit | 99715bbc447eb633e45ffa23b87284771ce3ac74 (patch) | |
| tree | 3a8a53dfe3dbdd9f8e36965e9f043eae522d3c0e /lisp/faces.el | |
| parent | 556b89447234f15d1784a23dadbfe429464463a8 (diff) | |
| parent | 763bb2d43615bc3ae816422f965d76d5e1ae4bdd (diff) | |
Merged from [email protected].
Patches applied:
* [email protected]/emacs--devo--0--patch-331
Update from CVS
* [email protected]/emacs--devo--0--patch-332
Update from CVS
* [email protected]/emacs--devo--0--patch-333
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-334
Update from CVS
* [email protected]/emacs--devo--0--patch-335
Add note about "link" button-class to etc/TODO
* [email protected]/emacs--devo--0--patch-336
Update from CVS
* [email protected]/emacs--devo--0--patch-337
Update from CVS
* [email protected]/emacs--devo--0--patch-338
Update from CVS
* [email protected]/emacs--devo--0--patch-339
Update from CVS
* [email protected]/emacs--devo--0--patch-340
Update from CVS
* [email protected]/emacs--devo--0--patch-341
Update from CVS
* [email protected]/emacs--devo--0--patch-342
Update from CVS
* [email protected]/emacs--devo--0--patch-343
Update from CVS
* [email protected]/emacs--devo--0--patch-344
Update from CVS
* [email protected]/emacs--devo--0--patch-345
Update from CVS
* [email protected]/emacs--devo--0--patch-346
Update from CVS
* [email protected]/emacs--devo--0--patch-347
Update from CVS
* [email protected]/emacs--devo--0--patch-348
Update for ERC 5.1.3.
* [email protected]/emacs--devo--0--patch-349
Update from CVS
* [email protected]/emacs--devo--0--patch-350
Merge from gnus--rel--5.10
* [email protected]/gnus--rel--5.10--patch-111
Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.
* [email protected]/gnus--rel--5.10--patch-112
Update from CVS
* [email protected]/gnus--rel--5.10--patch-113
Merge from emacs--devo--0
* [email protected]/gnus--rel--5.10--patch-114
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-572
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 9c6cff294b..f501e0054d 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -859,10 +859,11 @@ of the default face. Value is FACE." (defun read-face-name (prompt &optional string-describing-default multiple) "Read a face, defaulting to the face or faces on the char after point. -If it has a `read-face-name' property, that overrides the `face' property. -PROMPT describes what you will do with the face (don't end in a space). -STRING-DESCRIBING-DEFAULT describes what default you will use -if this function returns nil. +If it has the property `read-face-name', that overrides the `face' property. +PROMPT should be a string that describes what the caller will do with the face; +it should not end in a space. +STRING-DESCRIBING-DEFAULT should describe what default the caller will use if +the user just types RET; you can omit it. If MULTIPLE is non-nil, return a list of faces (possibly only one). Otherwise, return a single face." (let ((faceprop (or (get-char-property (point) 'read-face-name) |