Index: emacs/src/composite.c
diff -c emacs/src/composite.c:1.33 emacs/src/composite.c:1.34
*** emacs/src/composite.c:1.33 Mon Jul 4 16:06:29 2005
--- emacs/src/composite.c Thu Jul 21 16:28:00 2005
***************
*** 716,723 ****
Compose text in the region between START and END.
Optional 3rd and 4th arguments are COMPONENTS and MODIFICATION-FUNC
for the composition. See `compose-region' for more detail. */)
! (start, end, components, mod_func)
! Lisp_Object start, end, components, mod_func;
{
validate_region (&start, &end);
if (!NILP (components)
--- 716,723 ----
Compose text in the region between START and END.
Optional 3rd and 4th arguments are COMPONENTS and MODIFICATION-FUNC
for the composition. See `compose-region' for more detail. */)
! (start, end, components, modification_func)
! Lisp_Object start, end, components, modification_func;
{
validate_region (&start, &end);
if (!NILP (components)
***************
*** 726,732 ****
&& !STRINGP (components))
CHECK_VECTOR (components);
! compose_text (XINT (start), XINT (end), components, mod_func, Qnil);
return Qnil;
}
--- 726,732 ----
&& !STRINGP (components))
CHECK_VECTOR (components);
! compose_text (XINT (start), XINT (end), components, modification_func,
Qnil);
return Qnil;
}
***************
*** 737,744 ****
Compose text between indices START and END of STRING.
Optional 4th and 5th arguments are COMPONENTS and MODIFICATION-FUNC
for the composition. See `compose-string' for more detail. */)
! (string, start, end, components, mod_func)
! Lisp_Object string, start, end, components, mod_func;
{
CHECK_STRING (string);
CHECK_NUMBER (start);
--- 737,744 ----
Compose text between indices START and END of STRING.
Optional 4th and 5th arguments are COMPONENTS and MODIFICATION-FUNC
for the composition. See `compose-string' for more detail. */)
! (string, start, end, components, modification_func)
! Lisp_Object string, start, end, components, modification_func;
{
CHECK_STRING (string);
CHECK_NUMBER (start);
***************
*** 749,755 ****
|| XINT (end) > SCHARS (string))
args_out_of_range (start, end);
! compose_text (XINT (start), XINT (end), components, mod_func, string);
return string;
}
--- 749,755 ----
|| XINT (end) > SCHARS (string))
args_out_of_range (start, end);
! compose_text (XINT (start), XINT (end), components, modification_func,
string);
return string;
}
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
