diff options
| author | Andreas Schwab | 2008-06-16 12:02:44 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2008-06-16 12:02:44 +0000 |
| commit | 6f56895505bb88d1d0a9fcbba6f352333dd52b84 (patch) | |
| tree | cfbc2c36db1624c72e18d9c587fefe9c8c334027 /src | |
| parent | 2babb35916776707d86664664106cf11dc50a6d5 (diff) | |
| download | emacs-6f56895505bb88d1d0a9fcbba6f352333dd52b84.tar.gz emacs-6f56895505bb88d1d0a9fcbba6f352333dd52b84.zip | |
(Ffont_face_attributes): Fix definition.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/font.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 16e21ac3339..83180ad503d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-06-16 Andreas Schwab <schwab@suse.de> | ||
| 2 | |||
| 3 | * font.c (Ffont_face_attributes): Fix definition. | ||
| 4 | |||
| 1 | 2008-06-16 Jason Rumney <jasonr@gnu.org> | 5 | 2008-06-16 Jason Rumney <jasonr@gnu.org> |
| 2 | 6 | ||
| 3 | * font.h (font_style_symbolic_from_value): Remove. | 7 | * font.h (font_style_symbolic_from_value): Remove. |
diff --git a/src/font.c b/src/font.c index 6ccef312d7a..bfa7fe16455 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -3744,7 +3744,7 @@ DEFUN ("font-face-attributes", Ffont_face_attributes, Sfont_face_attributes, 1, | |||
| 3744 | FONT is a font name, a font-spec, a font-entity, or a font-object. | 3744 | FONT is a font name, a font-spec, a font-entity, or a font-object. |
| 3745 | The return value is a list of the form | 3745 | 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, FOUNDRY, HEIGHT, WEIGHT, SLANT, and WIDTH are face |
| 3750 | attribute values compatible with `set-face-attribute'. | 3750 | attribute values compatible with `set-face-attribute'. |
| @@ -3753,7 +3753,7 @@ The optional argument FRAME specifies the frame that the face | |||
| 3753 | attributes are to be displayed on. If omitted, the selected frame is | 3753 | attributes are to be displayed on. If omitted, the selected frame is |
| 3754 | used. */) | 3754 | used. */) |
| 3755 | (font, frame) | 3755 | (font, frame) |
| 3756 | Lisp_Object font; | 3756 | Lisp_Object font, frame; |
| 3757 | { | 3757 | { |
| 3758 | struct frame *f; | 3758 | struct frame *f; |
| 3759 | Lisp_Object plist[10]; | 3759 | Lisp_Object plist[10]; |