diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lisp/gnus/nnselect.el | |
parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/gnus/nnselect.el')
-rw-r--r-- | lisp/gnus/nnselect.el | 73 |
1 files changed, 36 insertions, 37 deletions
diff --git a/lisp/gnus/nnselect.el b/lisp/gnus/nnselect.el index fffa2d27312..ecec705b326 100644 --- a/lisp/gnus/nnselect.el +++ b/lisp/gnus/nnselect.el @@ -33,7 +33,7 @@ ;; turn be a vector of three elements: a real prefixed group name, an ;; article number in that group, and an integer score. The score is ;; not used by nnselect but may be used by other code to help in -;; sorting. Most functions will just chose a fixed number, such as +;; sorting. Most functions will just choose a fixed number, such as ;; 100, for this score. ;; For example the search function `gnus-search-run-query' applied to @@ -100,8 +100,8 @@ (setq selection (vconcat (cl-map 'vector - #'(lambda (art) - (vector artgroup art artrsv)) + (lambda (art) + (vector artgroup art artrsv)) (gnus-uncompress-sequence artseq)) selection))) selection))) @@ -211,12 +211,12 @@ as `(keyfunc member)' and the corresponding element is just #'nnselect-article-group #'nnselect-article-number)) ((eq ,type 'tuple) (nnselect-categorize ,articles - #'(lambda (elem) - (nnselect-article-group (car elem))) - #'(lambda (elem) - (cons (nnselect-article-number - (car elem)) - (cdr elem))))) + (lambda (elem) + (nnselect-article-group (car elem))) + (lambda (elem) + (cons (nnselect-article-number + (car elem)) + (cdr elem))))) (t (nnselect-categorize ,articles #'nnselect-article-group @@ -464,8 +464,8 @@ If this variable is nil, or if the provided function returns nil, (error "Group %s does not support article expiration" artgroup)) (unless (gnus-check-server (gnus-find-method-for-group artgroup)) (error "Couldn't open server for group %s" artgroup)) - (push (mapcar #'(lambda (art) - (car (rassq art artids))) + (push (mapcar (lambda (art) + (car (rassq art artids))) (let ((nnimap-expunge 'immediately)) (gnus-request-expire-articles artlist artgroup force))) @@ -549,8 +549,8 @@ If this variable is nil, or if the provided function returns nil, (gnus-add-to-range (gnus-info-read info) (delq nil (mapcar - #'(lambda (art) - (unless (memq (cdr art) unread) (car art))) + (lambda (art) + (unless (memq (cdr art) unread) (car art))) artids)))) (pcase-dolist (`(,type . ,mark-list) marks) (let ((mark-type (gnus-article-mark-to-type type)) new) @@ -560,19 +560,19 @@ If this variable is nil, or if the provided function returns nil, (cond ((eq mark-type 'tuple) (mapcar - #'(lambda (id) - (let (mark) - (when - (setq mark (assq (cdr id) mark-list)) - (cons (car id) (cdr mark))))) + (lambda (id) + (let (mark) + (when + (setq mark (assq (cdr id) mark-list)) + (cons (car id) (cdr mark))))) artids)) (t (setq mark-list (gnus-uncompress-range mark-list)) (mapcar - #'(lambda (id) - (when (memq (cdr id) mark-list) - (car id))) artids))))) + (lambda (id) + (when (memq (cdr id) mark-list) + (car id))) artids))))) (let ((previous (alist-get type newmarks))) (if previous (nconc previous new) @@ -607,8 +607,8 @@ If this variable is nil, or if the provided function returns nil, (let ((thread (gnus-id-to-thread (mail-header-id header)))) (when thread - (cl-some #'(lambda (x) - (when (and x (> x 0)) x)) + (cl-some (lambda (x) + (when (and x (> x 0)) x)) (gnus-articles-in-thread thread))))))))) ;; Check if search-based thread referral is permitted, and ;; available. @@ -642,15 +642,15 @@ If this variable is nil, or if the provided function returns nil, old-arts seq headers) (mapc - #'(lambda (article) - (if - (setq seq - (cl-position article - gnus-newsgroup-selection :test 'equal)) - (push (1+ seq) old-arts) - (setq gnus-newsgroup-selection - (vconcat gnus-newsgroup-selection (vector article))) - (cl-incf last))) + (lambda (article) + (if + (setq seq + (cl-position article + gnus-newsgroup-selection :test 'equal)) + (push (1+ seq) old-arts) + (setq gnus-newsgroup-selection + (vconcat gnus-newsgroup-selection (vector article))) + (cl-incf last))) new-nnselect-artlist) (setq headers (gnus-fetch-headers @@ -671,9 +671,9 @@ If this variable is nil, or if the provided function returns nil, (when (setq new-marks (delq nil (mapcar - #'(lambda (art) - (when (memq (cdr art) marked) - (car art))) + (lambda (art) + (when (memq (cdr art) marked) + (car art))) artids))) (nconc (symbol-value @@ -777,7 +777,7 @@ If this variable is nil, or if the provided function returns nil, Return an article list." (let ((func (alist-get 'nnselect-function specs)) (args (alist-get 'nnselect-args specs))) - (condition-case err + (condition-case-unless-debug err (funcall func args) (error (gnus-error 3 "nnselect-run: %s on %s gave error %s" func args err) [])))) @@ -968,7 +968,6 @@ Pass NO-PARSE on to the search engine." (gnus-group-make-search-group no-parse spec))) -;; The end. (provide 'nnselect) ;;; nnselect.el ends here |