diff options
| -rw-r--r-- | lisp/gnus/gnus-sum.el | 12 | ||||
| -rw-r--r-- | lisp/gnus/gnus-util.el | 15 |
2 files changed, 6 insertions, 21 deletions
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 5fb566e8886..2c87ba1573a 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el | |||
| @@ -8614,7 +8614,7 @@ fetched for this group." | |||
| 8614 | (gnus-agent nil) | 8614 | (gnus-agent nil) |
| 8615 | (gnus-read-all-available-headers t)) | 8615 | (gnus-read-all-available-headers t)) |
| 8616 | (setq gnus-newsgroup-headers | 8616 | (setq gnus-newsgroup-headers |
| 8617 | (gnus-merge | 8617 | (cl-merge |
| 8618 | 'list gnus-newsgroup-headers | 8618 | 'list gnus-newsgroup-headers |
| 8619 | (gnus-fetch-headers articles nil t) | 8619 | (gnus-fetch-headers articles nil t) |
| 8620 | 'gnus-article-sort-by-number)) | 8620 | 'gnus-article-sort-by-number)) |
| @@ -9026,7 +9026,7 @@ non-numeric or nil fetch the number specified by the | |||
| 9026 | (gnus-sorted-nunion gnus-newsgroup-unreads new-unreads)) | 9026 | (gnus-sorted-nunion gnus-newsgroup-unreads new-unreads)) |
| 9027 | (setq gnus-newsgroup-headers | 9027 | (setq gnus-newsgroup-headers |
| 9028 | (gnus-delete-duplicate-headers | 9028 | (gnus-delete-duplicate-headers |
| 9029 | (gnus-merge | 9029 | (cl-merge |
| 9030 | 'list gnus-newsgroup-headers new-headers | 9030 | 'list gnus-newsgroup-headers new-headers |
| 9031 | 'gnus-article-sort-by-number))) | 9031 | 'gnus-article-sort-by-number))) |
| 9032 | (setq gnus-newsgroup-articles | 9032 | (setq gnus-newsgroup-articles |
| @@ -12844,10 +12844,10 @@ returned." | |||
| 12844 | (mail-header-number h)) | 12844 | (mail-header-number h)) |
| 12845 | gnus-newsgroup-headers))) | 12845 | gnus-newsgroup-headers))) |
| 12846 | (setq gnus-newsgroup-headers | 12846 | (setq gnus-newsgroup-headers |
| 12847 | (gnus-merge 'list | 12847 | (cl-merge 'list |
| 12848 | gnus-newsgroup-headers | 12848 | gnus-newsgroup-headers |
| 12849 | (gnus-fetch-headers articles nil t) | 12849 | (gnus-fetch-headers articles nil t) |
| 12850 | 'gnus-article-sort-by-number)) | 12850 | 'gnus-article-sort-by-number)) |
| 12851 | (setq gnus-newsgroup-articles | 12851 | (setq gnus-newsgroup-articles |
| 12852 | (gnus-sorted-nunion gnus-newsgroup-articles articles)) | 12852 | (gnus-sorted-nunion gnus-newsgroup-articles articles)) |
| 12853 | ;; Suppress duplicates? | 12853 | ;; Suppress duplicates? |
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index eadf04dfe71..23c6cd92cfb 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el | |||
| @@ -1609,21 +1609,6 @@ sequence, this is like `mapcar'. With several, it is like the Common Lisp | |||
| 1609 | (cdr ,result))) | 1609 | (cdr ,result))) |
| 1610 | `(mapcar ,function ,seq1))) | 1610 | `(mapcar ,function ,seq1))) |
| 1611 | 1611 | ||
| 1612 | (if (fboundp 'merge) | ||
| 1613 | (defalias 'gnus-merge 'merge) | ||
| 1614 | ;; Adapted from cl-seq.el | ||
| 1615 | (defun gnus-merge (type list1 list2 pred) | ||
| 1616 | "Destructively merge lists LIST1 and LIST2 to produce a new list. | ||
| 1617 | Argument TYPE is for compatibility and ignored. | ||
| 1618 | Ordering of the elements is preserved according to PRED, a `less-than' | ||
| 1619 | predicate on the elements." | ||
| 1620 | (let ((res nil)) | ||
| 1621 | (while (and list1 list2) | ||
| 1622 | (if (funcall pred (car list2) (car list1)) | ||
| 1623 | (push (pop list2) res) | ||
| 1624 | (push (pop list1) res))) | ||
| 1625 | (nconc (nreverse res) list1 list2)))) | ||
| 1626 | |||
| 1627 | (defun gnus-emacs-version () | 1612 | (defun gnus-emacs-version () |
| 1628 | "Stringified Emacs version." | 1613 | "Stringified Emacs version." |
| 1629 | (let* ((lst (if (listp gnus-user-agent) | 1614 | (let* ((lst (if (listp gnus-user-agent) |