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

[Miles Bader]

Index: emacs/src/composite.c
diff -c emacs/src/composite.c:1.27 emacs/src/composite.c:1.28
*** emacs/src/composite.c:1.27  Fri Jan 10 07:49:26 2003
--- emacs/src/composite.c       Tue Feb  4 09:03:12 2003
***************
*** 249,255 ****
      }
  
    /* This composition is a new one.  We must register it.  */
!         
    /* Check if we have sufficient memory to store this information.  */
    if (composition_table_size == 0)
      {
--- 249,255 ----
      }
  
    /* This composition is a new one.  We must register it.  */
! 
    /* Check if we have sufficient memory to store this information.  */
    if (composition_table_size == 0)
      {
***************
*** 485,491 ****
  
    if (inhibit_modification_hooks)
      return;
!   
    /* If FROM and TO are not in a valid range, do nothing.  */
    if (! (BEGV <= from && from <= to && to <= ZV))
      return;
--- 485,491 ----
  
    if (inhibit_modification_hooks)
      return;
! 
    /* If FROM and TO are not in a valid range, do nothing.  */
    if (! (BEGV <= from && from <= to && to <= ZV))
      return;
***************
*** 754,760 ****
  }
  
  DEFUN ("find-composition-internal", Ffind_composition_internal,
!        Sfind_composition_internal, 4, 4, 0, 
         doc: /* Internal use only.
  
  Return information about composition at or nearest to position POS.
--- 754,760 ----
  }
  
  DEFUN ("find-composition-internal", Ffind_composition_internal,
!        Sfind_composition_internal, 4, 4, 0,
         doc: /* Internal use only.
  
  Return information about composition at or nearest to position POS.
***************
*** 775,781 ****
      }
    else
      end = -1;
!   
    if (!NILP (string))
      {
        CHECK_STRING (string);
--- 775,781 ----
      }
    else
      end = -1;
! 
    if (!NILP (string))
      {
        CHECK_STRING (string);
***************
*** 839,845 ****
    {
      Lisp_Object args[6];
      extern Lisp_Object QCsize;
!     
      args[0] = QCtest;
      args[1] = Qequal;
      args[2] = QCweakness;
--- 839,845 ----
    {
      Lisp_Object args[6];
      extern Lisp_Object QCsize;
! 
      args[0] = QCtest;
      args[1] = Qequal;
      args[2] = QCweakness;