diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-12-23 19:49:58 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-12-23 19:49:58 +0100 |
| commit | b99a4744822a11e4af098b63db18f54a4e323d58 (patch) | |
| tree | a3836dfbd6bf4ebfc5b61c566d146cfd65984f62 /lisp/gnus | |
| parent | ffcd490cb49ba86d625288ea425d98e8cac22a05 (diff) | |
| parent | 40bc77d9a6b8d824690fb6ee3003d74951bb3ae5 (diff) | |
| download | emacs-b99a4744822a11e4af098b63db18f54a4e323d58.tar.gz emacs-b99a4744822a11e4af098b63db18f54a4e323d58.tar.bz2 emacs-b99a4744822a11e4af098b63db18f54a4e323d58.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/gnus-search.el | 5 | ||||
| -rw-r--r-- | lisp/gnus/gnus-sum.el | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/gnus/gnus-search.el b/lisp/gnus/gnus-search.el index 16f3a024aa6..3a3722c90a3 100644 --- a/lisp/gnus/gnus-search.el +++ b/lisp/gnus/gnus-search.el @@ -1050,6 +1050,7 @@ Responsible for handling and, or, and parenthetical expressions.") (grouplist (or groups (gnus-search-get-active srv))) q-string artlist group) (message "Opening server %s" server) + (gnus-open-server srv) ;; We should only be doing this once, in ;; `nnimap-open-connection', but it's too frustrating to try to ;; get to the server from the process buffer. @@ -1071,7 +1072,7 @@ Responsible for handling and, or, and parenthetical expressions.") ;; A bit of backward-compatibility slash convenience: if the ;; query string doesn't start with any known IMAP search ;; keyword, assume it is a "TEXT" search. - (unless (and (string-match "\\`[^ [:blank:]]+" q-string) + (unless (and (string-match "\\`[^[:blank:]]+" q-string) (memql (intern-soft (downcase (match-string 0 q-string))) gnus-search-imap-search-keys)) @@ -1424,7 +1425,7 @@ Returns a list of [group article score] vectors." (string-to-number article) (nnmaildir-base-name-to-article-number (substring article 0 (string-match ":" article)) - group nil)) + group (string-remove-prefix "nnmaildir:" server))) (if (numberp score) score (string-to-number score))) diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index a0e7173998b..38edc772f8f 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -3658,6 +3658,7 @@ buffer that was in action when the last article was fetched." ;; so we don't call gnus-data-<field> accessors on nil. (gnus-newsgroup-data gnus--dummy-data-list) (gnus-newsgroup-downloadable '(0)) + (gnus-visual nil) case-fold-search ignores) ;; Here, all marks are bound to Z. (gnus-summary-insert-line gnus--dummy-mail-header |