diff options
| -rw-r--r-- | src/abbrev.c | 5 |
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.") | |||
| 295 | XINT (XSYMBOL (sym)->plist) + 1); /* Increment use count */ | 295 | XINT (XSYMBOL (sym)->plist) + 1); /* Increment use count */ |
| 296 | 296 | ||
| 297 | expansion = XSYMBOL (sym)->value; | 297 | expansion = XSYMBOL (sym)->value; |
| 298 | insert_from_string (expansion, 0, XSTRING (expansion)->size); | 298 | insert_from_string (expansion, 0, XSTRING (expansion)->size, 1); |
| 299 | SET_PT (point + whitecnt); | 299 | SET_PT (point + whitecnt); |
| 300 | 300 | ||
| 301 | if (uccount && !lccount) | 301 | if (uccount && !lccount) |
| @@ -359,8 +359,9 @@ is not undone.") | |||
| 359 | error ("value of abbrev-symbol must be a string"); | 359 | error ("value of abbrev-symbol must be a string"); |
| 360 | adjust = XSTRING (val)->size; | 360 | adjust = XSTRING (val)->size; |
| 361 | del_range (point, point + adjust); | 361 | del_range (point, point + adjust); |
| 362 | /* Don't inherit properties here; just copy from old contents. */ | ||
| 362 | insert_from_string (Vlast_abbrev_text, 0, | 363 | insert_from_string (Vlast_abbrev_text, 0, |
| 363 | XSTRING (Vlast_abbrev_text)->size); | 364 | XSTRING (Vlast_abbrev_text)->size, 0); |
| 364 | adjust -= XSTRING (Vlast_abbrev_text)->size; | 365 | adjust -= XSTRING (Vlast_abbrev_text)->size; |
| 365 | Vlast_abbrev_text = Qnil; | 366 | Vlast_abbrev_text = Qnil; |
| 366 | } | 367 | } |