[Emacs-diffs] /srv/bzr/emacs/trunk r105200: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 105200
author: Andrew Cohen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2011-07-14 14:19:53 +0000
message:
  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.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-int.el
  lisp/gnus/gnus-sum.el
  lisp/gnus/nnimap.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-07-10 22:17:49 +0000
+++ b/lisp/gnus/ChangeLog       2011-07-14 14:19:53 +0000
@@ -1,3 +1,12 @@
+2011-07-14  Andrew Cohen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-group.el (gnus-read-ephemeral-emacs-bug-group): `debbugs-*'

=== modified file 'lisp/gnus/gnus-int.el'
--- a/lisp/gnus/gnus-int.el     2011-03-15 22:38:41 +0000
+++ b/lisp/gnus/gnus-int.el     2011-07-14 14:19:53 +0000
@@ -516,11 +516,12 @@
             article (gnus-group-real-name group)
             (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."
-  (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)
-            header)))
+            header
+            (gnus-group-real-name group))))
 
 (defun gnus-warp-to-article ()
   "Warps from an article in a virtual group to the article in its

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2011-06-30 22:20:32 +0000
+++ b/lisp/gnus/gnus-sum.el     2011-07-14 14:19:53 +0000
@@ -8970,7 +8970,7 @@
           'list gnus-newsgroup-headers
           (if (gnus-check-backend-function
                'request-thread gnus-newsgroup-name)
-              (gnus-request-thread header)
+              (gnus-request-thread header gnus-newsgroup-name)
             (let* ((last (if (numberp limit)
                              (min (+ (mail-header-number header)
                                      limit)

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2011-07-04 13:11:52 +0000
+++ b/lisp/gnus/nnimap.el       2011-07-14 14:19:53 +0000
@@ -1565,8 +1565,9 @@
 (declare-function gnus-fetch-headers "gnus-sum"
                  (articles &optional limit force-new dependencies))
 
-(deffoo nnimap-request-thread (header)
-  (let* ((id (mail-header-id header))
+(deffoo nnimap-request-thread (header &optional group server)
+  (when (nnimap-possibly-change-group group server)
+      (let* ((id (mail-header-id header))
         (refs (split-string
                (or (mail-header-references header)
                    "")))
@@ -1584,7 +1585,7 @@
       (gnus-fetch-headers
        (and (car result) (delete 0 (mapcar #'string-to-number
                                           (cdr (assoc "SEARCH" (cdr 
result))))))
-       nil t))))
+       nil t)))))
 
 (defun nnimap-possibly-change-group (group server)
   (let ((open-result t))