diff options
| author | Juanma Barranquero | 2008-12-10 19:25:26 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2008-12-10 19:25:26 +0000 |
| commit | ba3de0e8f9c63473f19f168ecd44e51aea41467b (patch) | |
| tree | 464e2cc89761ffe6a230b8fed95df5b86e291090 /src | |
| parent | 17a937cccbe8450ce8995ec4680eb7dd7c38f6a8 (diff) | |
| download | emacs-ba3de0e8f9c63473f19f168ecd44e51aea41467b.tar.gz emacs-ba3de0e8f9c63473f19f168ecd44e51aea41467b.zip | |
* font.c (Ffont_spec): Move usage to end of docstring.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/font.c | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1f2728c35f1..1802b3ab23a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-12-10 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * font.c (Ffont_spec): Move usage to end of docstring. | ||
| 4 | |||
| 1 | 2008-12-10 Jason Rumney <jasonr@gnu.org> | 5 | 2008-12-10 Jason Rumney <jasonr@gnu.org> |
| 2 | 6 | ||
| 3 | * w32font.c (Qcham): New symbol. | 7 | * w32font.c (Qcham): New symbol. |
diff --git a/src/font.c b/src/font.c index 0267ade1c4b..4eed6d315f8 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -48,7 +48,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 48 | #endif /* HAVE_NS */ | 48 | #endif /* HAVE_NS */ |
| 49 | 49 | ||
| 50 | Lisp_Object Qfont_spec, Qfont_entity, Qfont_object; | 50 | Lisp_Object Qfont_spec, Qfont_entity, Qfont_object; |
| 51 | 51 | ||
| 52 | #ifdef HAVE_NS | 52 | #ifdef HAVE_NS |
| 53 | extern Lisp_Object Qfontsize; | 53 | extern Lisp_Object Qfontsize; |
| 54 | #endif | 54 | #endif |
| @@ -400,7 +400,7 @@ font_style_symbolic (font, prop, for_face) | |||
| 400 | font_assert (((i >> 4) & 0xF) < ASIZE (table)); | 400 | font_assert (((i >> 4) & 0xF) < ASIZE (table)); |
| 401 | elt = AREF (table, ((i >> 4) & 0xF)); | 401 | elt = AREF (table, ((i >> 4) & 0xF)); |
| 402 | font_assert ((i & 0xF) + 1 < ASIZE (elt)); | 402 | font_assert ((i & 0xF) + 1 < ASIZE (elt)); |
| 403 | return (for_face ? AREF (elt, 1) : AREF (elt, (i & 0xF) + 1)); | 403 | return (for_face ? AREF (elt, 1) : AREF (elt, (i & 0xF) + 1)); |
| 404 | } | 404 | } |
| 405 | 405 | ||
| 406 | extern Lisp_Object Vface_alternative_font_family_alist; | 406 | extern Lisp_Object Vface_alternative_font_family_alist; |
| @@ -3835,12 +3835,12 @@ specifying the font size. It specifies the font size in pixels | |||
| 3835 | `:name' | 3835 | `:name' |
| 3836 | 3836 | ||
| 3837 | VALUE must be a string of XLFD-style or fontconfig-style font name. | 3837 | VALUE must be a string of XLFD-style or fontconfig-style font name. |
| 3838 | usage: (font-spec ARGS ...) | ||
| 3839 | 3838 | ||
| 3840 | `:script' | 3839 | `:script' |
| 3841 | 3840 | ||
| 3842 | VALUE must be a symbol representing a script that the font must | 3841 | VALUE must be a symbol representing a script that the font must |
| 3843 | support. */) | 3842 | support. |
| 3843 | usage: (font-spec ARGS...) */) | ||
| 3844 | (nargs, args) | 3844 | (nargs, args) |
| 3845 | int nargs; | 3845 | int nargs; |
| 3846 | Lisp_Object *args; | 3846 | Lisp_Object *args; |
| @@ -4276,7 +4276,7 @@ created glyph-string. Otherwise, the value is nil. */) | |||
| 4276 | struct font *font; | 4276 | struct font *font; |
| 4277 | Lisp_Object font_object, n, glyph; | 4277 | Lisp_Object font_object, n, glyph; |
| 4278 | int i, j, from, to; | 4278 | int i, j, from, to; |
| 4279 | 4279 | ||
| 4280 | if (! composition_gstring_p (gstring)) | 4280 | if (! composition_gstring_p (gstring)) |
| 4281 | signal_error ("Invalid glyph-string: ", gstring); | 4281 | signal_error ("Invalid glyph-string: ", gstring); |
| 4282 | if (! NILP (LGSTRING_ID (gstring))) | 4282 | if (! NILP (LGSTRING_ID (gstring))) |
| @@ -4299,7 +4299,7 @@ created glyph-string. Otherwise, the value is nil. */) | |||
| 4299 | } | 4299 | } |
| 4300 | if (i == 3 || XINT (n) == 0) | 4300 | if (i == 3 || XINT (n) == 0) |
| 4301 | return Qnil; | 4301 | return Qnil; |
| 4302 | 4302 | ||
| 4303 | glyph = LGSTRING_GLYPH (gstring, 0); | 4303 | glyph = LGSTRING_GLYPH (gstring, 0); |
| 4304 | from = LGLYPH_FROM (glyph); | 4304 | from = LGLYPH_FROM (glyph); |
| 4305 | to = LGLYPH_TO (glyph); | 4305 | to = LGLYPH_TO (glyph); |
| @@ -4909,7 +4909,7 @@ font_deferred_log (action, arg, result) | |||
| 4909 | ASET (Vfont_log_deferred, 0, build_string (action)); | 4909 | ASET (Vfont_log_deferred, 0, build_string (action)); |
| 4910 | ASET (Vfont_log_deferred, 1, arg); | 4910 | ASET (Vfont_log_deferred, 1, arg); |
| 4911 | ASET (Vfont_log_deferred, 2, result); | 4911 | ASET (Vfont_log_deferred, 2, result); |
| 4912 | } | 4912 | } |
| 4913 | 4913 | ||
| 4914 | extern void syms_of_ftfont P_ (()); | 4914 | extern void syms_of_ftfont P_ (()); |
| 4915 | extern void syms_of_xfont P_ (()); | 4915 | extern void syms_of_xfont P_ (()); |