comparison lisp/gnus/nnir.el @ 111584:4273d2312244

Merge changes made in Gnus trunk. nnir.el (nnir-run-imap): Order the article list separately for each group. shr.el (shr-put-image): Break lines when inserting big pictures. mml2015.el (mml2015-epg-encrypt): Fix two cons with missing sender.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Wed, 17 Nov 2010 22:15:24 +0000
parents ea2c0f22a4ad
children ed117caa918e
comparison
equal deleted inserted replaced
111583:b59fc34f97fb 111584:4273d2312244
675 (defs (caddr (gnus-server-to-method srv))) 675 (defs (caddr (gnus-server-to-method srv)))
676 (criteria (or (cdr (assq 'criteria query)) 676 (criteria (or (cdr (assq 'criteria query))
677 (cdr (assoc nnir-imap-default-search-key 677 (cdr (assoc nnir-imap-default-search-key
678 nnir-imap-search-arguments)))) 678 nnir-imap-search-arguments))))
679 (gnus-inhibit-demon t) 679 (gnus-inhibit-demon t)
680 (groups (or groups (nnir-get-active srv))) 680 (groups (or groups (nnir-get-active srv))))
681 artlist)
682 (message "Opening server %s" server) 681 (message "Opening server %s" server)
683 (apply 682 (apply
684 'vconcat 683 'vconcat
685 (mapcar 684 (mapcar
686 (lambda (x) 685 (lambda (x)
687 (let ((group x)) 686 (let ((group x)
687 artlist)
688 (condition-case () 688 (condition-case ()
689 (when (nnimap-possibly-change-group 689 (when (nnimap-possibly-change-group
690 (gnus-group-short-name group) server) 690 (gnus-group-short-name group) server)
691 (with-current-buffer (nnimap-buffer) 691 (with-current-buffer (nnimap-buffer)
692 (message "Searching %s..." group) 692 (message "Searching %s..." group)