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

[Ken Raeburn]

Index: emacs/src/fns.c
diff -c emacs/src/fns.c:1.317 emacs/src/fns.c:1.318
*** emacs/src/fns.c:1.317       Sun Jul 14 20:00:36 2002
--- emacs/src/fns.c     Sun Jul 14 22:16:15 2002
***************
*** 714,720 ****
            }
          toindex_byte += thislen_byte;
          toindex += thisleni - combined;
!         SCHARS (val) -= combined;
        }
        /* Copy a single-byte string to a multibyte string.  */
        else if (STRINGP (this) && STRINGP (val))
--- 714,720 ----
            }
          toindex_byte += thislen_byte;
          toindex += thisleni - combined;
!         STRING_SET_CHARS (val, SCHARS (val) - combined);
        }
        /* Copy a single-byte string to a multibyte string.  */
        else if (STRINGP (this) && STRINGP (val))
***************
*** 804,810 ****
                        && toindex_byte > 0
                        && count_combining (SDATA (val),
                                            toindex_byte, toindex_byte - 1))
!                     SCHARS (val)--;
                    else
                      toindex++;
                  }
--- 804,810 ----
                        && toindex_byte > 0
                        && count_combining (SDATA (val),
                                            toindex_byte, toindex_byte - 1))
!                     STRING_SET_CHARS (val, SCHARS (val) - 1);
                    else
                      toindex++;
                  }