[Emacs-diffs] Changes to emacs/src/composite.c [emacs-unicode-2]

[Dave Love]

Index: emacs/src/composite.c
diff -c emacs/src/composite.c:1.28.6.1 emacs/src/composite.c:1.28.6.2
*** emacs/src/composite.c:1.28.6.1      Mon Sep  8 08:48:10 2003
--- emacs/src/composite.c       Wed Sep 17 09:50:54 2003
***************
*** 402,408 ****
  
  int
  find_composition (pos, limit, start, end, prop, object)
!      int pos, limit, *start, *end;
       Lisp_Object *prop, object;
  {
    Lisp_Object val;
--- 402,409 ----
  
  int
  find_composition (pos, limit, start, end, prop, object)
!      int pos, limit;
!      EMACS_INT *start, *end;
       Lisp_Object *prop, object;
  {
    Lisp_Object val;
***************
*** 446,452 ****
       Lisp_Object prop;
  {
    Lisp_Object func;
!   int start, end;
  
    func = COMPOSITION_MODIFICATION_FUNC (prop);
    /* If an invalid composition precedes or follows, try to make them
--- 447,453 ----
       Lisp_Object prop;
  {
    Lisp_Object func;
!   EMACS_INT start, end;
  
    func = COMPOSITION_MODIFICATION_FUNC (prop);
    /* If an invalid composition precedes or follows, try to make them
***************
*** 476,488 ****
  
  void
  update_compositions (from, to, check_mask)
!      int from, to, check_mask;
  {
    Lisp_Object prop;
!   int start, end;
    /* The beginning and end of the region to set the property
       `auto-composed' to nil.  */
!   int min_pos = from, max_pos = to;
  
    if (inhibit_modification_hooks)
      return;
--- 477,490 ----
  
  void
  update_compositions (from, to, check_mask)
!      EMACS_INT from, to;
!      int check_mask;
  {
    Lisp_Object prop;
!   EMACS_INT start, end;
    /* The beginning and end of the region to set the property
       `auto-composed' to nil.  */
!   EMACS_INT min_pos = from, max_pos = to;
  
    if (inhibit_modification_hooks)
      return;
***************
*** 663,669 ****
       Lisp_Object pos, limit, string, detail_p;
  {
    Lisp_Object prop, tail;
!   int start, end;
    int id;
  
    CHECK_NUMBER_COERCE_MARKER (pos);
--- 665,671 ----
       Lisp_Object pos, limit, string, detail_p;
  {
    Lisp_Object prop, tail;
!   EMACS_INT start, end;
    int id;
  
    CHECK_NUMBER_COERCE_MARKER (pos);