* 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.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/abbrev.c b/src/abbrev.c
index f31ccc9eda..f56054bda5 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,