diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2021-12-06 00:37:01 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2021-12-06 00:37:01 +0900 |
| commit | e5f74cecf132eb266abbaf7483bd793f45cc370f (patch) | |
| tree | 5c58e97632e36aa3bf6e7133c4bcc1e57e33afce /lisp/gnus | |
| parent | 6d7a1123b44ecc4b0f5f356df1eaea0b74e1e855 (diff) | |
| parent | 622550f7187f5ec9261a0d30b5ee6f440069a1e0 (diff) | |
| download | emacs-e5f74cecf132eb266abbaf7483bd793f45cc370f.tar.gz emacs-e5f74cecf132eb266abbaf7483bd793f45cc370f.tar.bz2 emacs-e5f74cecf132eb266abbaf7483bd793f45cc370f.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/gnus-msg.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/gnus-search.el | 10 | ||||
| -rw-r--r-- | lisp/gnus/nnselect.el | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el index bb265642bc6..c60faa13263 100644 --- a/lisp/gnus/gnus-msg.el +++ b/lisp/gnus/gnus-msg.el @@ -1748,7 +1748,7 @@ this is a reply." (concat "\"" str "\"") str))) (when groups - (insert " "))) + (insert ","))) (insert "\n"))))))) (defun gnus-mailing-list-followup-to () diff --git a/lisp/gnus/gnus-search.el b/lisp/gnus/gnus-search.el index bce5d57c521..c77de688e66 100644 --- a/lisp/gnus/gnus-search.el +++ b/lisp/gnus/gnus-search.el @@ -105,9 +105,13 @@ (gnus-add-shutdown #'gnus-search-shutdown 'gnus) -(define-error 'gnus-search-parse-error "Gnus search parsing error") +(define-error 'gnus-search-error "Gnus search error") -(define-error 'gnus-search-config-error "Gnus search configuration error") +(define-error 'gnus-search-parse-error "Gnus search parsing error" + 'gnus-search-error) + +(define-error 'gnus-search-config-error "Gnus search configuration error" + 'gnus-search-error) ;;; User Customizable Variables: @@ -1927,7 +1931,7 @@ Assume \"size\" key is equal to \"larger\"." (apply #'nnheader-message 4 "Search engine for %s improperly configured: %s" server (cdr err)) - (signal 'gnus-search-config-error err))))) + (signal (car err) (cdr err)))))) (alist-get 'search-group-spec specs)) ;; Some search engines do their own limiting, but some don't, so ;; do it again here. This is bad because, if the user is diff --git a/lisp/gnus/nnselect.el b/lisp/gnus/nnselect.el index ecec705b326..252e9f66838 100644 --- a/lisp/gnus/nnselect.el +++ b/lisp/gnus/nnselect.el @@ -779,6 +779,10 @@ Return an article list." (args (alist-get 'nnselect-args specs))) (condition-case-unless-debug err (funcall func args) + ;; Don't swallow gnus-search errors; the user should be made + ;; aware of them. + (gnus-search-error + (signal (car err) (cdr err))) (error (gnus-error 3 "nnselect-run: %s on %s gave error %s" func args err) [])))) |