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

[Kim F . Storm]

Index: emacs/src/composite.c
diff -c emacs/src/composite.c:1.35 emacs/src/composite.c:1.36
*** emacs/src/composite.c:1.35  Sun Aug  7 12:33:16 2005
--- emacs/src/composite.c       Mon Sep 12 20:38:47 2005
***************
*** 616,622 ****
        GCPRO1 (string);
        stop = end;
        ptr = SDATA (string) + string_char_to_byte (string, start);
!       pend = ptr + SBYTES (string);
      }
    else
      {
--- 616,622 ----
        GCPRO1 (string);
        stop = end;
        ptr = SDATA (string) + string_char_to_byte (string, start);
!       pend = SDATA (string) + SBYTES (string);
      }
    else
      {
***************
*** 680,688 ****
                    {
                      start += XINT (val);
                      if (STRINGP (string))
!                       ptr = SDATA (string) + string_char_to_byte (string, 
start);
                      else
                        ptr = CHAR_POS_ADDR (start);
                    }
                  else
                    {
--- 680,697 ----
                    {
                      start += XINT (val);
                      if (STRINGP (string))
!                       {
!                         ptr = SDATA (string) + string_char_to_byte (string, 
start);
!                         pend = SDATA (string) + SBYTES (string);
!                       }
                      else
                        ptr = CHAR_POS_ADDR (start);
+                   }
+                 else if (STRINGP (string))
+                   {
+                     start++;
+                     ptr = SDATA (string) + string_char_to_byte (string, 
start);
+                     pend = SDATA (string) + SBYTES (string);
                    }
                  else
                    {