From bf7e38643d5143d0e37960e4439bfc466699e29a Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Sun, 16 Mar 2014 15:46:28 +0100
Subject: [PATCH] Refine unwind-only exception message.

* libguile/throw.c (throw_without_pre_unwind): Refine warning message.
---
 libguile/throw.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/libguile/throw.c b/libguile/throw.c
index fd84f6048..bef1ecf03 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -184,8 +184,14 @@ throw_without_pre_unwind (SCM tag, SCM args)
         continue;
 
       if (scm_is_true (scm_c_vector_ref (eh, 3)))
-        fprintf (stderr, "\nWarning: unwind-only exception, perhaps due to "
-                 "stack overflow; not running pre-unwind handlers.\n");
+        {
+          char *key_chars;
+
+          key_chars = scm_to_locale_string (scm_symbol_to_string (tag));
+          fprintf (stderr, "Warning: Unwind-only `%s' exception; "
+                   "skipping pre-unwind handler.\n", key_chars);
+          free (key_chars);
+        }
 
       prompt_tag = scm_c_vector_ref (eh, 2);
       if (scm_is_true (prompt_tag))