org-agenda.el (org-agenda-error): Use `user-error'

* org-agenda.el (org-agenda-error): Use `user-error'.
Merge remote-tracking branch 'upstream/master'