Mercurial > emacs
changeset 96012:c04088bb7b0d
(Ffont_face_attributes): Fix definition.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Mon, 16 Jun 2008 12:02:44 +0000 |
| parents | a4a026112f5a |
| children | 04be82e0cbd3 |
| files | src/ChangeLog src/font.c |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Jun 16 11:46:33 2008 +0000 +++ b/src/ChangeLog Mon Jun 16 12:02:44 2008 +0000 @@ -1,3 +1,7 @@ +2008-06-16 Andreas Schwab <schwab@suse.de> + + * font.c (Ffont_face_attributes): Fix definition. + 2008-06-16 Jason Rumney <jasonr@gnu.org> * font.h (font_style_symbolic_from_value): Remove.
--- a/src/font.c Mon Jun 16 11:46:33 2008 +0000 +++ b/src/font.c Mon Jun 16 12:02:44 2008 +0000 @@ -3744,7 +3744,7 @@ 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 @@ 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];