1 files changed, 6 insertions, 14 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 2d9828ffa79..6b07f0bd7b1 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -5370,23 +5370,15 @@ See Info node `(elisp)Garbage Collection'.  */)
 	mark_object (tail->var[i]);
   }
   mark_byte_stack ();
+#endif
   {
-    struct catchtag *catch;
     struct handler *handler;
-
-  for (catch = catchlist; catch; catch = catch->next)
-    {
-      mark_object (catch->tag);
-      mark_object (catch->val);
-    }
-  for (handler = handlerlist; handler; handler = handler->next)
-    {
-      mark_object (handler->handler);
-      mark_object (handler->var);
-    }
+    for (handler = handlerlist; handler; handler = handler->next)
+      {
+	mark_object (handler->tag_or_ch);
+	mark_object (handler->val);
+      }
   }
-#endif
-
 #ifdef HAVE_WINDOW_SYSTEM
   mark_fringe_data ();
 #endif