From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sat, 7 Aug 2021 10:55:39 +0000 (+0200)
Subject: Make `q' in `org-agenda' work even with `debug-on-error' set
X-Git-Tag: emacs-28.0.90~1591^2~4
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6a3920c07eaae58408dd27e7db22bff7ad4d1f80;p=emacs.git

Make `q' in `org-agenda' work even with `debug-on-error' set

* lisp/org/org-agenda.el (org-agenda-get-restriction-and-command):
Using `error' here will trigger users with `debug-on-error' so use
`user-error' instead (bug#49920).  It would probably be preferable
to rewrite this to not use the error system to do control flow.
---

diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 8a4aa2b1be0..3acc18715dd 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -3205,7 +3205,7 @@ s   Search for keywords                 M   Like m, but only TODO entries
             (delete-window)
             (org-agenda-get-restriction-and-command prefix-descriptions))
 
-	   ((equal c ?q) (error "Abort"))
+	   ((equal c ?q) (user-error "Abort"))
 	   (t (user-error "Invalid key %c" c))))))))
 
 (defun org-agenda-fit-window-to-buffer ()