# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 784422811 0
# Node ID 8a68b5794c91afed8630d1aefe1c7552ff25fdfa
# Parent  689bcdba1d4077ba954f4d76ade5ec5b7fe19fb9
(Fboundp, find_symbol_value): Use type test macros instead of checking XTYPE
directly.

diff -r 689bcdba1d40 -r 8a68b5794c91 src/data.c
--- a/src/data.c	Wed Nov 09 22:54:15 1994 +0000
+++ b/src/data.c	Wed Nov 09 23:13:31 1994 +0000
@@ -464,16 +464,9 @@
 
   valcontents = XSYMBOL (sym)->value;
 
-#ifdef SWITCH_ENUM_BUG
-  switch ((int) XTYPE (valcontents))
-#else
-  switch (XTYPE (valcontents))
-#endif
-    {
-    case Lisp_Buffer_Local_Value:
-    case Lisp_Some_Buffer_Local_Value:
-      valcontents = swap_in_symval_forwarding (sym, valcontents);
-    }
+  if (LISP_BUFFER_LOCAL_VALUEP (valcontents)
+      || LISP_SOME_BUFFER_LOCAL_VALUEP (valcontents))
+    valcontents = swap_in_symval_forwarding (sym, valcontents);
 
   return (EQ (valcontents, Qunbound) ? Qnil : Qt);
 }
@@ -765,19 +758,12 @@
   CHECK_SYMBOL (sym, 0);
   valcontents = XSYMBOL (sym)->value;
 
- retry:
-#ifdef SWITCH_ENUM_BUG
-  switch ((int) XTYPE (valcontents))
-#else
-  switch (XTYPE (valcontents))
-#endif
+  if (LISP_BUFFER_LOCAL_VALUEP (valcontents)
+      || LISP_SOME_BUFFER_LOCAL_VALUEP (valcontents))
+    valcontents = swap_in_symval_forwarding (sym, valcontents);
+
+  if (MISCP (valcontents))
     {
-    case Lisp_Buffer_Local_Value:
-    case Lisp_Some_Buffer_Local_Value:
-      valcontents = swap_in_symval_forwarding (sym, valcontents);
-      goto retry;
-
-    case Lisp_Misc:
       switch (XMISC (valcontents)->type)
 	{
 	case Lisp_Misc_Intfwd: