emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Stefan Monnier
Subject: master a6b41a8: * src/minibuf.c (read_minibuf): Use `user-error`
Date: Mon, 23 Dec 2019 23:48:02 -0500 (EST)

branch: master
commit a6b41a817e8d760ab3be417779f4c0e36fa1160e
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    * src/minibuf.c (read_minibuf): Use `user-error`
---
 src/minibuf.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/minibuf.c b/src/minibuf.c
index f8790f5..7b17e7d 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]