From: Andreas Schwab Date: Mon, 16 Jun 2008 12:02:44 +0000 (+0000) Subject: (Ffont_face_attributes): Fix definition. X-Git-Tag: emacs-pretest-23.0.90~4726 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/6f56895505bb88d1d0a9fcbba6f352333dd52b84 (Ffont_face_attributes): Fix definition. --- diff --git a/src/ChangeLog b/src/ChangeLog index 16e21ac333..83180ad503 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-06-16 Andreas Schwab + + * font.c (Ffont_face_attributes): Fix definition. + 2008-06-16 Jason Rumney * font.h (font_style_symbolic_from_value): Remove. diff --git a/src/font.c b/src/font.c index 6ccef312d7..bfa7fe1645 100644 --- a/src/font.c +++ b/src/font.c @@ -3744,7 +3744,7 @@ DEFUN ("font-face-attributes", Ffont_face_attributes, Sfont_face_attributes, 1, FONT is a font name, a font-spec, a font-entity, or a font-object. The return value is a list of the form -(:family FAMILY :height HEIGHT :weight WEIGHT :slant SLANT :width WIDTH) +\(:family FAMILY :height HEIGHT :weight WEIGHT :slant SLANT :width WIDTH) where FAMILY, FOUNDRY, HEIGHT, WEIGHT, SLANT, and WIDTH are face attribute values compatible with `set-face-attribute'. @@ -3753,7 +3753,7 @@ The optional argument FRAME specifies the frame that the face attributes are to be displayed on. If omitted, the selected frame is used. */) (font, frame) - Lisp_Object font; + Lisp_Object font, frame; { struct frame *f; Lisp_Object plist[10];