/[emacs]/emacs/src/abbrev.c
ViewVC logotype

Diff of /emacs/src/abbrev.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.54 by raeburn, Mon May 20 08:04:46 2002 UTC revision 1.55 by raeburn, Mon Jul 15 00:00:35 2002 UTC
# Line 344  Returns the abbrev symbol, if expansion Line 344  Returns the abbrev symbol, if expansion
344    
345        del_range_both (wordstart, wordstart_byte, wordend, wordend_byte, 1);        del_range_both (wordstart, wordstart_byte, wordend, wordend_byte, 1);
346    
347        insert_from_string (expansion, 0, 0, XSTRING (expansion)->size,        insert_from_string (expansion, 0, 0, SCHARS (expansion),
348                            STRING_BYTES (XSTRING (expansion)), 1);                            SBYTES (expansion), 1);
349        SET_PT (PT + whitecnt);        SET_PT (PT + whitecnt);
350    
351        if (uccount && !lccount)        if (uccount && !lccount)
# Line 427  is not undone.  */) Line 427  is not undone.  */)
427        if (!STRINGP (val))        if (!STRINGP (val))
428          error ("value of abbrev-symbol must be a string");          error ("value of abbrev-symbol must be a string");
429        zv_before = ZV;        zv_before = ZV;
430        del_range_byte (PT_BYTE, PT_BYTE + STRING_BYTES (XSTRING (val)), 1);        del_range_byte (PT_BYTE, PT_BYTE + SBYTES (val), 1);
431        /* Don't inherit properties here; just copy from old contents.  */        /* Don't inherit properties here; just copy from old contents.  */
432        insert_from_string (Vlast_abbrev_text, 0, 0,        insert_from_string (Vlast_abbrev_text, 0, 0,
433                            XSTRING (Vlast_abbrev_text)->size,                            SCHARS (Vlast_abbrev_text),
434                            STRING_BYTES (XSTRING (Vlast_abbrev_text)), 0);                            SBYTES (Vlast_abbrev_text), 0);
435        Vlast_abbrev_text = Qnil;        Vlast_abbrev_text = Qnil;
436        /* Total number of characters deleted.  */        /* Total number of characters deleted.  */
437        adjust = ZV - zv_before;        adjust = ZV - zv_before;

Legend:
Removed from v.1.54  
changed lines
  Added in v.1.55

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26