diff options
| author | Juanma Barranquero | 2008-06-16 13:32:07 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2008-06-16 13:32:07 +0000 |
| commit | 7a18a1780af6ec3a93cd4856656284ddae2526db (patch) | |
| tree | 73cb9ccf5a20c6a55413bc848b9b4a8d83e76f62 /src | |
| parent | 6f56895505bb88d1d0a9fcbba6f352333dd52b84 (diff) | |
| download | emacs-7a18a1780af6ec3a93cd4856656284ddae2526db.tar.gz emacs-7a18a1780af6ec3a93cd4856656284ddae2526db.zip | |
(Ffont_spec): Fix usage in docstring.
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 83180ad503d..081bb57540e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-06-16 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * font.c (Ffont_spec): Fix usage in docstring. | ||
| 4 | |||
| 1 | 2008-06-16 Andreas Schwab <schwab@suse.de> | 5 | 2008-06-16 Andreas Schwab <schwab@suse.de> |
| 2 | 6 | ||
| 3 | * font.c (Ffont_face_attributes): Fix definition. | 7 | * font.c (Ffont_face_attributes): Fix definition. |
diff --git a/src/font.c b/src/font.c index bfa7fe16455..2e8dbdcb538 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -3627,11 +3627,11 @@ encoding of a font, e.g. ``iso8859-1''. | |||
| 3627 | VALUE must be a non-negative integer or a floating point number | 3627 | VALUE must be a non-negative integer or a floating point number |
| 3628 | specifying the font size. It specifies the font size in pixels | 3628 | specifying the font size. It specifies the font size in pixels |
| 3629 | (if VALUE is an integer), or in points (if VALUE is a float). | 3629 | (if VALUE is an integer), or in points (if VALUE is a float). |
| 3630 | usage: (font-spec ARGS ...) | ||
| 3631 | 3630 | ||
| 3632 | `:name' | 3631 | `:name' |
| 3633 | 3632 | ||
| 3634 | VALUE must be a string of XLFD-style or fontconfig-style font name. */) | 3633 | VALUE must be a string of XLFD-style or fontconfig-style font name. |
| 3634 | usage: (font-spec ARGS ...) */) | ||
| 3635 | (nargs, args) | 3635 | (nargs, args) |
| 3636 | int nargs; | 3636 | int nargs; |
| 3637 | Lisp_Object *args; | 3637 | Lisp_Object *args; |