# HG changeset patch
# User Jim Blandy <jimb@redhat.com>
# Date 720506971 0
# Node ID 94aa6a66e921a1988878e24eeac341db0a7baead
# Parent  098464e977d6f0bb921aa1a5217820cbd8bd8f27
	* 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.

diff -r 098464e977d6 -r 94aa6a66e921 src/abbrev.c
--- a/src/abbrev.c	Fri Oct 30 06:01:13 1992 +0000
+++ b/src/abbrev.c	Sat Oct 31 04:49:31 1992 +0000
@@ -354,7 +354,9 @@
       /* 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,