aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2008-06-16 13:44:18 +0000
committerJuanma Barranquero2008-06-16 13:44:18 +0000
commit48105a6a307c43821c230a0ccf27fcbed3c0129d (patch)
treed2172f786ab957d7bd107a6ce5cba76d4c548c06 /src
parent7a18a1780af6ec3a93cd4856656284ddae2526db (diff)
downloademacs-48105a6a307c43821c230a0ccf27fcbed3c0129d.tar.gz
emacs-48105a6a307c43821c230a0ccf27fcbed3c0129d.zip
(Ffont_face_attributes): Doc fix.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/font.c9
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 @@
12008-06-16 Juanma Barranquero <lekktu@gmail.com> 12008-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
52008-06-16 Andreas Schwab <schwab@suse.de> 62008-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
3749where FAMILY, FOUNDRY, HEIGHT, WEIGHT, SLANT, and WIDTH are face 3749where FAMILY, HEIGHT, WEIGHT, SLANT, and WIDTH are face attribute values
3750attribute values compatible with `set-face-attribute'. 3750compatible with `set-face-attribute'.
3751 3751
3752The optional argument FRAME specifies the frame that the face 3752The optional argument FRAME specifies the frame that the face attributes
3753attributes are to be displayed on. If omitted, the selected frame is 3753are to be displayed on. If omitted, the selected frame is used. */)
3754used. */)
3755 (font, frame) 3754 (font, frame)
3756 Lisp_Object font, frame; 3755 Lisp_Object font, frame;
3757{ 3756{