aboutsummaryrefslogtreecommitdiffstats
path: root/src/composite.c
diff options
context:
space:
mode:
authorDan Nicolaescu2010-07-08 14:25:08 -0700
committerDan Nicolaescu2010-07-08 14:25:08 -0700
commit5842a27bbfb7efa6872824e501bc7ec98b631553 (patch)
treed173899af9cbed9d90d94cfc710e6ecc06dd1f6b /src/composite.c
parent71c44c04bb996abe77db8efd88255fde06532b10 (diff)
downloademacs-5842a27bbfb7efa6872824e501bc7ec98b631553.tar.gz
emacs-5842a27bbfb7efa6872824e501bc7ec98b631553.zip
Convert DEFUNs to standard C.
* src/alloc.c: Convert DEFUNs to standard C. * src/buffer.c: * src/bytecode.c: * src/callint.c: * src/callproc.c: * src/casefiddle.c: * src/casetab.c: * src/category.c: * src/character.c: * src/charset.c: * src/chartab.c: * src/cmds.c: * src/coding.c: * src/composite.c: * src/data.c: * src/dbusbind.c: * src/dired.c: * src/dispnew.c: * src/doc.c: * src/dosfns.c: * src/editfns.c: * src/emacs.c: * src/eval.c: * src/fileio.c: * src/filelock.c: * src/floatfns.c: * src/fns.c: * src/font.c: * src/fontset.c: * src/frame.c: * src/fringe.c: * src/image.c: * src/indent.c: * src/insdel.c: * src/keyboard.c: * src/keymap.c: * src/lread.c: * src/macros.c: * src/marker.c: * src/menu.c: * src/minibuf.c: * src/msdos.c: * src/nsfns.m: * src/nsmenu.m: * src/nsselect.m: * src/print.c: * src/process.c: * src/search.c: * src/sound.c: * src/syntax.c: * src/term.c: * src/terminal.c: * src/textprop.c: * src/undo.c: * src/w16select.c: * src/w32console.c: * src/w32fns.c: * src/w32font.c: * src/w32menu.c: * src/w32proc.c: * src/w32select.c: * src/window.c: * src/xdisp.c: * src/xfaces.c: * src/xfns.c: * src/xmenu.c: * src/xselect.c: * src/xsettings.c: * src/xsmfns.c: Likewise.
Diffstat (limited to 'src/composite.c')
-rw-r--r--src/composite.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/composite.c b/src/composite.c
index f7b0211ecb8..4568698619f 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1758,8 +1758,7 @@ where
1758 1758
1759If GLYPH is nil, the remaining elements of the glyph-string vector 1759If GLYPH is nil, the remaining elements of the glyph-string vector
1760should be ignored. */) 1760should be ignored. */)
1761 (from, to, font_object, string) 1761 (Lisp_Object from, Lisp_Object to, Lisp_Object font_object, Lisp_Object string)
1762 Lisp_Object font_object, from, to, string;
1763{ 1762{
1764 Lisp_Object gstring, header; 1763 Lisp_Object gstring, header;
1765 EMACS_INT frompos, topos; 1764 EMACS_INT frompos, topos;
@@ -1804,8 +1803,7 @@ DEFUN ("compose-region-internal", Fcompose_region_internal,
1804Compose text in the region between START and END. 1803Compose text in the region between START and END.
1805Optional 3rd and 4th arguments are COMPONENTS and MODIFICATION-FUNC 1804Optional 3rd and 4th arguments are COMPONENTS and MODIFICATION-FUNC
1806for the composition. See `compose-region' for more details. */) 1805for the composition. See `compose-region' for more details. */)
1807 (start, end, components, modification_func) 1806 (Lisp_Object start, Lisp_Object end, Lisp_Object components, Lisp_Object modification_func)
1808 Lisp_Object start, end, components, modification_func;
1809{ 1807{
1810 validate_region (&start, &end); 1808 validate_region (&start, &end);
1811 if (!NILP (components) 1809 if (!NILP (components)
@@ -1825,8 +1823,7 @@ DEFUN ("compose-string-internal", Fcompose_string_internal,
1825Compose text between indices START and END of STRING. 1823Compose text between indices START and END of STRING.
1826Optional 4th and 5th arguments are COMPONENTS and MODIFICATION-FUNC 1824Optional 4th and 5th arguments are COMPONENTS and MODIFICATION-FUNC
1827for the composition. See `compose-string' for more details. */) 1825for the composition. See `compose-string' for more details. */)
1828 (string, start, end, components, modification_func) 1826 (Lisp_Object string, Lisp_Object start, Lisp_Object end, Lisp_Object components, Lisp_Object modification_func)
1829 Lisp_Object string, start, end, components, modification_func;
1830{ 1827{
1831 CHECK_STRING (string); 1828 CHECK_STRING (string);
1832 CHECK_NUMBER (start); 1829 CHECK_NUMBER (start);
@@ -1847,8 +1844,7 @@ DEFUN ("find-composition-internal", Ffind_composition_internal,
1847 1844
1848Return information about composition at or nearest to position POS. 1845Return information about composition at or nearest to position POS.
1849See `find-composition' for more details. */) 1846See `find-composition' for more details. */)
1850 (pos, limit, string, detail_p) 1847 (Lisp_Object pos, Lisp_Object limit, Lisp_Object string, Lisp_Object detail_p)
1851 Lisp_Object pos, limit, string, detail_p;
1852{ 1848{
1853 Lisp_Object prop, tail, gstring; 1849 Lisp_Object prop, tail, gstring;
1854 EMACS_INT start, end, from, to; 1850 EMACS_INT start, end, from, to;