From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 24 Dec 2019 04:47:54 +0000 (-0500)
Subject: * src/minibuf.c (read_minibuf): Use `user-error`
X-Git-Tag: emacs-28.0.90~7952
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a6b41a817e8d760ab3be417779f4c0e36fa1160e;p=emacs.git

* src/minibuf.c (read_minibuf): Use `user-error`
---

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