From a9a0a5613a250c8a3dd4b53b837d977806a23b67 Mon Sep 17 00:00:00 2001
From: Matthias Andreas Benkard <matthias@benkard.de>
Date: Sun, 3 Aug 2008 01:03:25 +0200
Subject: TAGBODY: Do not return NIL from the second-to-last section function.

---
 control-flow.lisp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'control-flow.lisp')

diff --git a/control-flow.lisp b/control-flow.lisp
index 5552e96..03825be 100644
--- a/control-flow.lisp
+++ b/control-flow.lisp
@@ -114,12 +114,13 @@
                              (setq current-label clause
                                    current-function (gensym))
                              (prog1
-                               `((,old-function ()
-                                    ,@(nreverse accumulated-clauses)
-                                    ,(if rest `#',current-function `nil))
-                                 ,@(when (endp rest)
-                                     `(,current-function ()
-                                        ',end-marker)))
+                               (when old-function
+                                 `((,old-function ()
+                                     ,@(nreverse accumulated-clauses)
+                                     #',current-function)
+                                   ,@(when (endp rest)
+                                       `((,current-function ()
+                                           ',end-marker)))))
                                (setq accumulated-clauses nil))))
                           (t (pushq clause accumulated-clauses)
                              (if (endp rest)
-- 
cgit v1.2.3