Fix merge conflicts in network-stream-tests.el

[gnu-emacs] / src / eval.c

diff --git a/src/eval.c b/src/eval.c
index c01dd09199f1b65884cea7c2725c05d65b8cb9f2..b6bf0e64052be7983f2d1d1fbca1373a6e5335e2 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -1245,7 +1245,7 @@ internal_lisp_condition_case (volatile Lisp_Object var, Lisp_Object bodyform,
     for (i = 0; i < clausenb; i++)
       {
        Lisp_Object clause = clauses[i];
-       Lisp_Object condition = XCAR (clause);
+       Lisp_Object condition = CONSP (clause) ? XCAR (clause) : Qnil;
        if (!CONSP (condition))
          condition = Fcons (condition, Qnil);
        struct handler *c = push_handler (condition, CONDITION_CASE);