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

[Stefan Monnier]

Index: emacs/src/editfns.c
diff -c emacs/src/editfns.c:1.401 emacs/src/editfns.c:1.402
*** emacs/src/editfns.c:1.401   Fri Sep 30 22:38:16 2005
--- emacs/src/editfns.c Mon Oct 24 03:51:05 2005
***************
*** 2472,2480 ****
  {
    register int begp1, endp1, begp2, endp2, temp;
    register struct buffer *bp1, *bp2;
!   register Lisp_Object *trt
      = (!NILP (current_buffer->case_fold_search)
!        ? XCHAR_TABLE (current_buffer->case_canon_table)->contents : 0);
    int chars = 0;
    int i1, i2, i1_byte, i2_byte;
  
--- 2472,2480 ----
  {
    register int begp1, endp1, begp2, endp2, temp;
    register struct buffer *bp1, *bp2;
!   register Lisp_Object trt
      = (!NILP (current_buffer->case_fold_search)
!        ? XCHAR_TABLE (current_buffer->case_canon_table) : Qnil);
    int chars = 0;
    int i1, i2, i1_byte, i2_byte;
  
***************
*** 2593,2602 ****
          i2++;
        }
  
!       if (trt)
        {
!         c1 = XINT (trt[c1]);
!         c2 = XINT (trt[c2]);
        }
        if (c1 < c2)
        return make_number (- 1 - chars);
--- 2593,2602 ----
          i2++;
        }
  
!       if (!NILP (trt))
        {
!         c1 = CHAR_TABLE_TRANSLATE (trt, c1);
!         c2 = CHAR_TABLE_TRANSLATE (trt, c2);
        }
        if (c1 < c2)
        return make_number (- 1 - chars);