[elpa] externals/org 926dbaf 2/2: Merge branch 'km/from-emacs-master'

[ELPA Syncer]

branch: externals/org
commit 926dbafe43bbb80ed763d850c86a488e54c7364d
Merge: a6d93cf 0f7fcc9
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>

    Merge branch 'km/from-emacs-master'
---
 lisp/org-agenda.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 44acd03..b4e5547 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -3226,7 +3226,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 ()