Commit 0c136286 authored by Andrew Cohen's avatar Andrew Cohen Committed by Katsumi Yamaoka
Browse files

Merge changes made in Gnus trunk.

nnimap.el (nnimap-request-thread): Ensure search is performed in correct group.
gnus-int.el (gnus-request-thread): Add group argument.
gnus-sum.el (gnus-request-thread): Use it.
parent fc233c9d
2011-07-14 Andrew Cohen <cohen@andy.bu.edu>
* nnimap.el (nnimap-request-thread): Ensure search is performed in
correct group.
* gnus-int.el (gnus-request-thread): Add group argument.
* gnus-sum.el (gnus-request-thread): Use it.
2011-07-10 Lars Magne Ingebrigtsen <larsi@gnus.org> 2011-07-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
   
* gnus-group.el (gnus-read-ephemeral-emacs-bug-group): `debbugs-*' * gnus-group.el (gnus-read-ephemeral-emacs-bug-group): `debbugs-*'
......
...@@ -516,11 +516,12 @@ If BUFFER, insert the article in that group." ...@@ -516,11 +516,12 @@ If BUFFER, insert the article in that group."
article (gnus-group-real-name group) article (gnus-group-real-name group)
(nth 1 gnus-command-method) buffer))) (nth 1 gnus-command-method) buffer)))
(defun gnus-request-thread (header) (defun gnus-request-thread (header group)
"Request the headers in the thread containing the article specified by HEADER." "Request the headers in the thread containing the article specified by HEADER."
(let ((gnus-command-method (gnus-find-method-for-group gnus-newsgroup-name))) (let ((gnus-command-method (gnus-find-method-for-group group)))
(funcall (gnus-get-function gnus-command-method 'request-thread) (funcall (gnus-get-function gnus-command-method 'request-thread)
header))) header
(gnus-group-real-name group))))
(defun gnus-warp-to-article () (defun gnus-warp-to-article ()
"Warps from an article in a virtual group to the article in its "Warps from an article in a virtual group to the article in its
......
...@@ -8970,7 +8970,7 @@ variable." ...@@ -8970,7 +8970,7 @@ variable."
'list gnus-newsgroup-headers 'list gnus-newsgroup-headers
(if (gnus-check-backend-function (if (gnus-check-backend-function
'request-thread gnus-newsgroup-name) 'request-thread gnus-newsgroup-name)
(gnus-request-thread header) (gnus-request-thread header gnus-newsgroup-name)
(let* ((last (if (numberp limit) (let* ((last (if (numberp limit)
(min (+ (mail-header-number header) (min (+ (mail-header-number header)
limit) limit)
......
...@@ -1565,8 +1565,9 @@ textual parts.") ...@@ -1565,8 +1565,9 @@ textual parts.")
(declare-function gnus-fetch-headers "gnus-sum" (declare-function gnus-fetch-headers "gnus-sum"
(articles &optional limit force-new dependencies)) (articles &optional limit force-new dependencies))
(deffoo nnimap-request-thread (header) (deffoo nnimap-request-thread (header &optional group server)
(let* ((id (mail-header-id header)) (when (nnimap-possibly-change-group group server)
(let* ((id (mail-header-id header))
(refs (split-string (refs (split-string
(or (mail-header-references header) (or (mail-header-references header)
""))) "")))
...@@ -1584,7 +1585,7 @@ textual parts.") ...@@ -1584,7 +1585,7 @@ textual parts.")
(gnus-fetch-headers (gnus-fetch-headers
(and (car result) (delete 0 (mapcar #'string-to-number (and (car result) (delete 0 (mapcar #'string-to-number
(cdr (assoc "SEARCH" (cdr result)))))) (cdr (assoc "SEARCH" (cdr result))))))
nil t)))) nil t)))))
(defun nnimap-possibly-change-group (group server) (defun nnimap-possibly-change-group (group server)
(let ((open-result t)) (let ((open-result t))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment