Mercurial > emacs

changeset 4717:5297e155e1d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Funexpand_abbrev, Fexpand_abbrev): Pass new arg to insert_from_string.
author Richard M. Stallman <rms@gnu.org>
date Tue, 14 Sep 1993 12:10:27 +0000
parents 4382ad05411e
children a05b833e61c4
files src/abbrev.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/abbrev.c	Tue Sep 14 12:10:02 1993 +0000
+++ b/src/abbrev.c	Tue Sep 14 12:10:27 1993 +0000
@@ -295,7 +295,7 @@
 	     XINT (XSYMBOL (sym)->plist) + 1);	/* Increment use count */
 
   expansion = XSYMBOL (sym)->value;
-  insert_from_string (expansion, 0, XSTRING (expansion)->size);
+  insert_from_string (expansion, 0, XSTRING (expansion)->size, 1);
   SET_PT (point + whitecnt);
 
   if (uccount && !lccount)
@@ -359,8 +359,9 @@
 	error ("value of abbrev-symbol must be a string");
       adjust = XSTRING (val)->size;
       del_range (point, point + adjust);
+      /* Don't inherit properties here; just copy from old contents.  */
       insert_from_string (Vlast_abbrev_text, 0,
-			  XSTRING (Vlast_abbrev_text)->size);
+			  XSTRING (Vlast_abbrev_text)->size, 0);
       adjust -= XSTRING (Vlast_abbrev_text)->size;
       Vlast_abbrev_text = Qnil;
     }