1 files changed, 4 insertions, 3 deletions

diff --git a/src/minibuf.c b/src/minibuf.c
index f8790f55070..7b17e7dc05b 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -414,12 +414,13 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
   if (!enable_recursive_minibuffers
       && minibuf_level > 0)
     {
+      Lisp_Object str = build_string ("Command attempted to use minibuffer"
+                                      "while in minibuffer");
       if (EQ (selected_window, minibuf_window))
-        error ("Command attempted to use minibuffer while in minibuffer");
+        Fsignal (Quser_error, (list1 (str)));
       else
         /* If we're in another window, cancel the minibuffer that's active.  */
-        Fthrow (Qexit,
-                build_string ("Command attempted to use minibuffer while in minibuffer"));
+        Fthrow (Qexit, str);
     }
 
   if ((noninteractive