diff options
| author | Stefan Monnier | 2019-12-23 23:47:54 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2019-12-23 23:47:54 -0500 |
| commit | a6b41a817e8d760ab3be417779f4c0e36fa1160e (patch) | |
| tree | e7834aad6f57bcba2cfd4e694906b5936ddc73fa | |
| parent | 60fba710c5eef278b80623956ead0803f8607155 (diff) | |
| download | emacs-a6b41a817e8d760ab3be417779f4c0e36fa1160e.tar.gz emacs-a6b41a817e8d760ab3be417779f4c0e36fa1160e.zip | |
* src/minibuf.c (read_minibuf): Use `user-error`
| -rw-r--r-- | src/minibuf.c | 7 |
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, | |||
| 414 | if (!enable_recursive_minibuffers | 414 | if (!enable_recursive_minibuffers |
| 415 | && minibuf_level > 0) | 415 | && minibuf_level > 0) |
| 416 | { | 416 | { |
| 417 | Lisp_Object str = build_string ("Command attempted to use minibuffer" | ||
| 418 | "while in minibuffer"); | ||
| 417 | if (EQ (selected_window, minibuf_window)) | 419 | if (EQ (selected_window, minibuf_window)) |
| 418 | error ("Command attempted to use minibuffer while in minibuffer"); | 420 | Fsignal (Quser_error, (list1 (str))); |
| 419 | else | 421 | else |
| 420 | /* If we're in another window, cancel the minibuffer that's active. */ | 422 | /* If we're in another window, cancel the minibuffer that's active. */ |
| 421 | Fthrow (Qexit, | 423 | Fthrow (Qexit, str); |
| 422 | build_string ("Command attempted to use minibuffer while in minibuffer")); | ||
| 423 | } | 424 | } |
| 424 | 425 | ||
| 425 | if ((noninteractive | 426 | if ((noninteractive |