diff options
| author | Juanma Barranquero | 2008-06-16 13:44:18 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2008-06-16 13:44:18 +0000 |
| commit | 48105a6a307c43821c230a0ccf27fcbed3c0129d (patch) | |
| tree | d2172f786ab957d7bd107a6ce5cba76d4c548c06 /src | |
| parent | 7a18a1780af6ec3a93cd4856656284ddae2526db (diff) | |
| download | emacs-48105a6a307c43821c230a0ccf27fcbed3c0129d.tar.gz emacs-48105a6a307c43821c230a0ccf27fcbed3c0129d.zip | |
(Ffont_face_attributes): Doc fix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/font.c | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 081bb57540e..bee9a722029 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | 2008-06-16 Juanma Barranquero <lekktu@gmail.com> | 1 | 2008-06-16 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 2 | ||
| 3 | * font.c (Ffont_spec): Fix usage in docstring. | 3 | * font.c (Ffont_spec): Fix usage in docstring. |
| 4 | (Ffont_face_attributes): Doc fix. | ||
| 4 | 5 | ||
| 5 | 2008-06-16 Andreas Schwab <schwab@suse.de> | 6 | 2008-06-16 Andreas Schwab <schwab@suse.de> |
| 6 | 7 | ||
diff --git a/src/font.c b/src/font.c index 2e8dbdcb538..5ee4d3a7e80 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -3746,12 +3746,11 @@ The return value is a list of the form | |||
| 3746 | 3746 | ||
| 3747 | \(:family FAMILY :height HEIGHT :weight WEIGHT :slant SLANT :width WIDTH) | 3747 | \(:family FAMILY :height HEIGHT :weight WEIGHT :slant SLANT :width WIDTH) |
| 3748 | 3748 | ||
| 3749 | where FAMILY, FOUNDRY, HEIGHT, WEIGHT, SLANT, and WIDTH are face | 3749 | where FAMILY, HEIGHT, WEIGHT, SLANT, and WIDTH are face attribute values |
| 3750 | attribute values compatible with `set-face-attribute'. | 3750 | compatible with `set-face-attribute'. |
| 3751 | 3751 | ||
| 3752 | The optional argument FRAME specifies the frame that the face | 3752 | The optional argument FRAME specifies the frame that the face attributes |
| 3753 | attributes are to be displayed on. If omitted, the selected frame is | 3753 | are to be displayed on. If omitted, the selected frame is used. */) |
| 3754 | used. */) | ||
| 3755 | (font, frame) | 3754 | (font, frame) |
| 3756 | Lisp_Object font, frame; | 3755 | Lisp_Object font, frame; |
| 3757 | { | 3756 | { |