Mercurial > emacs
changeset 100336:d53183123ad7
* font.c (Ffont_spec): Move usage to end of docstring.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Wed, 10 Dec 2008 19:25:26 +0000 |
| parents | 9e362b15a65b |
| children | 1bb4b8e45f2b |
| files | src/ChangeLog src/font.c |
| diffstat | 2 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Dec 10 19:02:05 2008 +0000 +++ b/src/ChangeLog Wed Dec 10 19:25:26 2008 +0000 @@ -1,3 +1,7 @@ +2008-12-10 Juanma Barranquero <lekktu@gmail.com> + + * font.c (Ffont_spec): Move usage to end of docstring. + 2008-12-10 Jason Rumney <jasonr@gnu.org> * w32font.c (Qcham): New symbol.
--- a/src/font.c Wed Dec 10 19:02:05 2008 +0000 +++ b/src/font.c Wed Dec 10 19:25:26 2008 +0000 @@ -48,7 +48,7 @@ #endif /* HAVE_NS */ Lisp_Object Qfont_spec, Qfont_entity, Qfont_object; - + #ifdef HAVE_NS extern Lisp_Object Qfontsize; #endif @@ -400,7 +400,7 @@ font_assert (((i >> 4) & 0xF) < ASIZE (table)); elt = AREF (table, ((i >> 4) & 0xF)); font_assert ((i & 0xF) + 1 < ASIZE (elt)); - return (for_face ? AREF (elt, 1) : AREF (elt, (i & 0xF) + 1)); + return (for_face ? AREF (elt, 1) : AREF (elt, (i & 0xF) + 1)); } extern Lisp_Object Vface_alternative_font_family_alist; @@ -3835,12 +3835,12 @@ `:name' VALUE must be a string of XLFD-style or fontconfig-style font name. -usage: (font-spec ARGS ...) `:script' VALUE must be a symbol representing a script that the font must -support. */) +support. +usage: (font-spec ARGS...) */) (nargs, args) int nargs; Lisp_Object *args; @@ -4276,7 +4276,7 @@ struct font *font; Lisp_Object font_object, n, glyph; int i, j, from, to; - + if (! composition_gstring_p (gstring)) signal_error ("Invalid glyph-string: ", gstring); if (! NILP (LGSTRING_ID (gstring))) @@ -4299,7 +4299,7 @@ } if (i == 3 || XINT (n) == 0) return Qnil; - + glyph = LGSTRING_GLYPH (gstring, 0); from = LGLYPH_FROM (glyph); to = LGLYPH_TO (glyph); @@ -4909,7 +4909,7 @@ ASET (Vfont_log_deferred, 0, build_string (action)); ASET (Vfont_log_deferred, 1, arg); ASET (Vfont_log_deferred, 2, result); -} +} extern void syms_of_ftfont P_ (()); extern void syms_of_xfont P_ (());