/[emacs]/emacs/src/composite.c
ViewVC logotype

Diff of /emacs/src/composite.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.33 by lute, Mon Jul 4 16:06:29 2005 UTC revision 1.34 by lektu, Thu Jul 21 16:28:00 2005 UTC
# Line 716  DEFUN ("compose-region-internal", Fcompo Line 716  DEFUN ("compose-region-internal", Fcompo
716  Compose text in the region between START and END.  Compose text in the region between START and END.
717  Optional 3rd and 4th arguments are COMPONENTS and MODIFICATION-FUNC  Optional 3rd and 4th arguments are COMPONENTS and MODIFICATION-FUNC
718  for the composition.  See `compose-region' for more detail.  */)  for the composition.  See `compose-region' for more detail.  */)
719       (start, end, components, mod_func)       (start, end, components, modification_func)
720       Lisp_Object start, end, components, mod_func;       Lisp_Object start, end, components, modification_func;
721  {  {
722    validate_region (&start, &end);    validate_region (&start, &end);
723    if (!NILP (components)    if (!NILP (components)
# Line 726  for the composition.  See `compose-regio Line 726  for the composition.  See `compose-regio
726        && !STRINGP (components))        && !STRINGP (components))
727      CHECK_VECTOR (components);      CHECK_VECTOR (components);
728    
729    compose_text (XINT (start), XINT (end), components, mod_func, Qnil);    compose_text (XINT (start), XINT (end), components, modification_func, Qnil);
730    return Qnil;    return Qnil;
731  }  }
732    
# Line 737  DEFUN ("compose-string-internal", Fcompo Line 737  DEFUN ("compose-string-internal", Fcompo
737  Compose text between indices START and END of STRING.  Compose text between indices START and END of STRING.
738  Optional 4th and 5th arguments are COMPONENTS and MODIFICATION-FUNC  Optional 4th and 5th arguments are COMPONENTS and MODIFICATION-FUNC
739  for the composition.  See `compose-string' for more detail.  */)  for the composition.  See `compose-string' for more detail.  */)
740       (string, start, end, components, mod_func)       (string, start, end, components, modification_func)
741       Lisp_Object string, start, end, components, mod_func;       Lisp_Object string, start, end, components, modification_func;
742  {  {
743    CHECK_STRING (string);    CHECK_STRING (string);
744    CHECK_NUMBER (start);    CHECK_NUMBER (start);
# Line 749  for the composition.  See `compose-strin Line 749  for the composition.  See `compose-strin
749        || XINT (end) > SCHARS (string))        || XINT (end) > SCHARS (string))
750      args_out_of_range (start, end);      args_out_of_range (start, end);
751    
752    compose_text (XINT (start), XINT (end), components, mod_func, string);    compose_text (XINT (start), XINT (end), components, modification_func, string);
753    return string;    return string;
754  }  }
755    

Legend:
Removed from v.1.33  
changed lines
  Added in v.1.34

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26