summaryrefslogtreecommitdiff
path: root/src/abbrev.c
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1993-09-14 12:10:27 +0000
committerRichard M. Stallman <rms@gnu.org>1993-09-14 12:10:27 +0000
commitbdc440b398e4047403b79775eaa777afb561d2af (patch)
tree02c38b48928665601906980764965be904e48a5d /src/abbrev.c
parent82d485cd7decdc3547a445d2ed58e2341ec780a4 (diff)
downloademacs-bdc440b398e4047403b79775eaa777afb561d2af.tar.gz
(Funexpand_abbrev, Fexpand_abbrev): Pass new arg to insert_from_string.
Diffstat (limited to 'src/abbrev.c')
-rw-r--r--src/abbrev.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/abbrev.c b/src/abbrev.c
index 9477c501b36..8338a0da558 100644
--- a/src/abbrev.c
+++ b/src/abbrev.c
@@ -295,7 +295,7 @@ Returns t if expansion took place.")
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 @@ is not undone.")
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;
}