[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/gnus-select2 10c5fa1 18/32: Remove unnecessary lis
From: |
Andrew G Cohen |
Subject: |
[Emacs-diffs] feature/gnus-select2 10c5fa1 18/32: Remove unnecessary listing in nnselect-categorize |
Date: |
Sun, 16 Dec 2018 06:54:03 -0500 (EST) |
branch: feature/gnus-select2
commit 10c5fa1f7e62f83d165648a5c20ad457b196f8ed
Author: Andrew G Cohen <address@hidden>
Commit: Andrew G Cohen <address@hidden>
Remove unnecessary listing in nnselect-categorize
* lisp/gnus/nnselect.el (nnselect-categorize): Remove unneeded extra
list around a category value.
(nnselect-retrieve-headers):
(nnselect-request-expire-articles):
(nnselect-request-set-mark):
(nnselect-request-update-info):
(nnselect-request-thread):
(nnselect-push-info):
(gnus-group-make-permanent-search-group): Accommodate change to
nnselect-categorize.
* lisp/gnus/nnir.el (nnir-run-query): Accommodate change to
nnselect-categorize.
---
lisp/gnus/nnir.el | 2 +-
lisp/gnus/nnselect.el | 36 ++++++++++++++++++------------------
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index d7aa3a7..883edf3 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -1265,7 +1265,7 @@ construct path: search terms (see the variable
(search-func (cadr (assoc search-engine nnir-engines))))
(and search-func
(funcall search-func (cdr (assq 'nnir-query-spec specs))
- server (cadr x)))))
+ server (cdr x)))))
(cdr (assq 'nnir-group-spec specs)))))
(defun nnir-server-to-search-engine (server)
diff --git a/lisp/gnus/nnselect.el b/lisp/gnus/nnselect.el
index ea0687d..1357c4c 100644
--- a/lisp/gnus/nnselect.el
+++ b/lisp/gnus/nnselect.el
@@ -156,9 +156,9 @@ as `(keyfunc member)' and the corresponding element is just
(,value (,valuefunc member))
(kr (assoc ,key ,result)))
(if kr
- (push ,value (cadr kr))
- (push (list ,key (list ,value)) ,result))))
- ,sequence)
+ (push ,value (cdr kr))
+ (push (list ,key ,value) ,result))))
+ (reverse ,sequence))
,result))))
@@ -215,7 +215,7 @@ If this variable is nil, or if the provided function
returns nil,
(gartids (ids-by-group articles))
headers)
(with-current-buffer nntp-server-buffer
- (pcase-dolist (`(,artgroup ,artids) gartids)
+ (pcase-dolist (`(,artgroup . ,artids) gartids)
(let ((artlist (sort (mapcar 'cdr artids) '<))
(gnus-override-method (gnus-find-method-for-group artgroup))
(fetch-old
@@ -337,7 +337,7 @@ If this variable is nil, or if the provided function
returns nil,
;; (nnselect-possibly-change-group group server)
(if force
(let (not-expired)
- (pcase-dolist (`(,artgroup ,artids) (ids-by-group articles))
+ (pcase-dolist (`(,artgroup . ,artids) (ids-by-group articles))
(let ((artlist (sort (mapcar 'cdr artids) '<)))
(unless (gnus-check-backend-function 'request-expire-articles
artgroup)
@@ -394,7 +394,7 @@ If this variable is nil, or if the provided function
returns nil,
;; is this necessary?
;; (nnselect-possibly-change-group group server)
(mapc
- (lambda (request) (gnus-request-set-mark (car request) (cadr request)))
+ (lambda (request) (gnus-request-set-mark (car request) (cdr request)))
(nnselect-categorize
(cl-mapcan
(lambda (act)
@@ -402,12 +402,12 @@ If this variable is nil, or if the provided function
returns nil,
(mapcar
(lambda (artgroup)
(list (car artgroup)
- (list (gnus-compress-sequence (sort (cadr artgroup) '<))
- action marks)))
+ (gnus-compress-sequence (sort (cdr artgroup) '<))
+ action marks))
(numbers-by-group
(gnus-uncompress-range range)))))
actions)
- car cadr)))
+ car cdr)))
(deffoo nnselect-request-update-info (group info &optional server)
(let ((group (nnselect-possibly-change-group group server))
@@ -415,7 +415,7 @@ If this variable is nil, or if the provided function
returns nil,
nnselect-artlist)))
(gnus-info-set-marks info nil)
(gnus-info-set-read info nil)
- (pcase-dolist (`(,artgroup ,nartids)
+ (pcase-dolist (`(,artgroup . ,nartids)
(ids-by-group
(number-sequence 1 (nnselect-artlist-length
gnus-newsgroup-selection))))
@@ -473,7 +473,7 @@ If this variable is nil, or if the provided function
returns nil,
(list (delq nil (list
(or server (gnus-group-server artgroup))
(unless gnus-refer-thread-use-search
- (list artgroup))))))
+ artgroup)))))
(query-spec
(list (cons 'query (nnimap-make-thread-query header))
(cons 'criteria "")))
@@ -513,7 +513,7 @@ If this variable is nil, or if the provided function
returns nil,
gnus-newsgroup-selection)
(when (>= last first)
(let (new-marks)
- (pcase-dolist (`(,artgroup ,artids)
+ (pcase-dolist (`(,artgroup . ,artids)
(ids-by-group (number-sequence first last)))
(pcase-dolist (`(,type . ,marked)
(gnus-info-marks (gnus-get-info artgroup)))
@@ -690,8 +690,8 @@ originating groups."
(symbol-value (intern (format "gnus-newsgroup-%s" mark))))
(push (cons type
(numbers-by-group
- (reverse (gnus-uncompress-range type-list)))) mark-list)))
- (pcase-dolist (`(,artgroup ,artlist)
+ (gnus-uncompress-range type-list))) mark-list)))
+ (pcase-dolist (`(,artgroup . ,artlist)
(numbers-by-group gnus-newsgroup-articles))
(let* ((group-info (gnus-get-info artgroup))
(old-unread (gnus-list-of-unread-articles artgroup))
@@ -699,7 +699,7 @@ originating groups."
(pcase-dolist (`(,_mark . ,type) gnus-article-mark-lists)
(let ((select-type
(sort
- (cadr (assoc artgroup (alist-get type mark-list)))
+ (cdr (assoc artgroup (alist-get type mark-list)))
'<)) list)
(setq list
(gnus-uncompress-range
@@ -735,7 +735,7 @@ originating groups."
;; unseen is now seen.
(when (eq type 'seen)
(setq list (gnus-range-add
- list (cadr (assoc artgroup select-unseen)))))
+ list (cdr (assoc artgroup select-unseen)))))
(when (or list (eq type 'unexist))
(push (cons type list) newmarked))))
@@ -762,8 +762,8 @@ originating groups."
(gnus-add-to-range
(gnus-remove-from-range
old-unread
- (cadr (assoc artgroup select-reads)))
- (sort (cadr (assoc artgroup select-unreads)) '<))))
+ (cdr (assoc artgroup select-reads)))
+ (sort (cdr (assoc artgroup select-unreads)) '<))))
(gnus-get-unread-articles-in-group
group-info (gnus-active artgroup) t)
(gnus-group-update-group artgroup t))))))
- [Emacs-diffs] feature/gnus-select2 6111aa1 09/32: Don't stomp on local variables in gnus-msg, (continued)
- [Emacs-diffs] feature/gnus-select2 6111aa1 09/32: Don't stomp on local variables in gnus-msg, Andrew G Cohen, 2018/12/16
- [Emacs-diffs] feature/gnus-select2 c9c16c9 22/32: * lisp/gnus/nnselect.el (nnselect-server-opened): Just return t., Andrew G Cohen, 2018/12/16
- [Emacs-diffs] feature/gnus-select2 2174d0f 20/32: Improve nnselect-request-article, Andrew G Cohen, 2018/12/16
- [Emacs-diffs] feature/gnus-select2 8ad88ac 24/32: * lisp/gnus/nnselect.el (nnselect-request-rename-group): Allow it., Andrew G Cohen, 2018/12/16
- [Emacs-diffs] feature/gnus-select2 73c0da2 27/32: Improve search and select group creation, Andrew G Cohen, 2018/12/16
- [Emacs-diffs] feature/gnus-select2 fe5f3c2 32/32: Set gnus-newsgroup-selection in the summary buffer, Andrew G Cohen, 2018/12/16
- [Emacs-diffs] feature/gnus-select2 5868104 30/32: Allow automatic scanning of nnselect groups, Andrew G Cohen, 2018/12/16
- [Emacs-diffs] feature/gnus-select2 0693d49 31/32: Remove nnselect-artlist variable in nnselect, Andrew G Cohen, 2018/12/16
- [Emacs-diffs] feature/gnus-select2 5699fda 28/32: * lisp/gnus/gnus-srvr.el (gnus-server-mode-map): Use ephemeral group, Andrew G Cohen, 2018/12/16
- [Emacs-diffs] feature/gnus-select2 465b580 29/32: * lisp/gnus/nnir.el (nnir-make-specs): Use the current buffer., Andrew G Cohen, 2018/12/16
- [Emacs-diffs] feature/gnus-select2 10c5fa1 18/32: Remove unnecessary listing in nnselect-categorize,
Andrew G Cohen <=
- [Emacs-diffs] feature/gnus-select2 5d9101a 25/32: Inline nnselect helper macros, Andrew G Cohen, 2018/12/16
- [Emacs-diffs] feature/gnus-select2 0187e0b 26/32: Redo entry functions for making search groups, Andrew G Cohen, 2018/12/16
- [Emacs-diffs] feature/gnus-select2 fe97015 01/32: Initial landing of gnus nnselect backend, Andrew G Cohen, 2018/12/16