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

[Ken Raeburn]

Index: emacs/src/abbrev.c
diff -c emacs/src/abbrev.c:1.54 emacs/src/abbrev.c:1.55
*** emacs/src/abbrev.c:1.54     Mon May 20 04:04:46 2002
--- emacs/src/abbrev.c  Sun Jul 14 20:00:35 2002
***************
*** 344,351 ****
  
        del_range_both (wordstart, wordstart_byte, wordend, wordend_byte, 1);
  
!       insert_from_string (expansion, 0, 0, XSTRING (expansion)->size,
!                         STRING_BYTES (XSTRING (expansion)), 1);
        SET_PT (PT + whitecnt);
  
        if (uccount && !lccount)
--- 344,351 ----
  
        del_range_both (wordstart, wordstart_byte, wordend, wordend_byte, 1);
  
!       insert_from_string (expansion, 0, 0, SCHARS (expansion),
!                         SBYTES (expansion), 1);
        SET_PT (PT + whitecnt);
  
        if (uccount && !lccount)
***************
*** 427,437 ****
        if (!STRINGP (val))
        error ("value of abbrev-symbol must be a string");
        zv_before = ZV;
!       del_range_byte (PT_BYTE, PT_BYTE + STRING_BYTES (XSTRING (val)), 1);
        /* Don't inherit properties here; just copy from old contents.  */
        insert_from_string (Vlast_abbrev_text, 0, 0,
!                         XSTRING (Vlast_abbrev_text)->size,
!                         STRING_BYTES (XSTRING (Vlast_abbrev_text)), 0);
        Vlast_abbrev_text = Qnil;
        /* Total number of characters deleted.  */
        adjust = ZV - zv_before;
--- 427,437 ----
        if (!STRINGP (val))
        error ("value of abbrev-symbol must be a string");
        zv_before = ZV;
!       del_range_byte (PT_BYTE, PT_BYTE + SBYTES (val), 1);
        /* Don't inherit properties here; just copy from old contents.  */
        insert_from_string (Vlast_abbrev_text, 0, 0,
!                         SCHARS (Vlast_abbrev_text),
!                         SBYTES (Vlast_abbrev_text), 0);
        Vlast_abbrev_text = Qnil;
        /* Total number of characters deleted.  */
        adjust = ZV - zv_before;