summaryrefslogtreecommitdiff
path: root/src/abbrev.c
diff options
context:
space:
mode:
authorJim Blandy <jimb@redhat.com>1992-10-31 04:49:31 +0000
committerJim Blandy <jimb@redhat.com>1992-10-31 04:49:31 +0000
commit4458687ccf10b5df9051c15a3bd853414ba0ba1c (patch)
treefeb1eca27fa053c293e9fe8eb3c40fd33e7eb9fd /src/abbrev.c
parent03e130d5cad91052f51c1a43e58a72924b3d18bc (diff)
downloademacs-4458687ccf10b5df9051c15a3bd853414ba0ba1c.tar.gz
* abbrev.c (Funexpand_abbrev): Just assign the last abbrev's value
to val; don't use XSET. Make sure that the value of the abbrev-symbol is a string.
Diffstat (limited to 'src/abbrev.c')
-rw-r--r--src/abbrev.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/abbrev.c b/src/abbrev.c
index f31ccc9edae..f56054bda51 100644
--- a/src/abbrev.c
+++ b/src/abbrev.c
@@ -354,7 +354,9 @@ is not undone.")
/* This isn't correct if Vlast_abbrev->function was used
to do the expansion */
Lisp_Object val;
- XSET (val, Lisp_String, XSYMBOL (Vlast_abbrev)->value);
+ val = XSYMBOL (Vlast_abbrev)->value;
+ if (XTYPE (val) != Lisp_String)
+ error ("value of abbrev-symbol must be a string");
adjust = XSTRING (val)->size;
del_range (point, point + adjust);
insert_from_string (Vlast_abbrev_text, 0,