From cddad0d8e195e94e08f7a4a176da32bb43fe5f26 Mon Sep 17 00:00:00 2001
From: Stas Boukarev <stassats@gmail.com>
Date: Wed, 11 Jun 2014 20:17:34 +0400
Subject: [PATCH] Handle DRIBBLE during SAVE-LISP-AND-DIE.

Provide a restartable error when DRIBBLE is enabled, either aborting
s-l-a-d, or disabling DRIBBLE.
---
 src/code/save.lisp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/code/save.lisp b/src/code/save.lisp
index 6c9a4a1e3..e553fe227 100644
--- a/src/code/save.lisp
+++ b/src/code/save.lisp
@@ -171,6 +171,14 @@ sufficiently motivated to do lengthy fixes."
   #!-sb-core-compression
   (when compression
     (error "Unable to save compressed core: this runtime was not built with zlib support"))
+  (when *dribble-stream*
+    (restart-case (error "Dribbling to ~s is enabled." (pathname *dribble-stream*))
+      (continue ()
+        :report "Stop dribbling and save the core."
+        (dribble))
+      (abort ()
+        :report "Abort saving the core."
+        (return-from save-lisp-and-die))))
   (when (eql t compression)
     (setf compression -1))
   (tune-hashtable-sizes-of-all-packages)
-- 
2.11.4.GIT