Mercurial > emacs
diff lisp/gnus/imap.el @ 66454:9082bf778ad8
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-621
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 147-148)
- Update from CVS
2005-10-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-score.el (gnus-default-adaptive-score-alist): Set defaults
depending on gnus-score-decay-constant.
2005-10-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
* lisp/gnus/nnslashdot.el (nnslashdot-request-article)
(nnslashdot-retrieve-headers-1): Update to new HTML.
2005-10-23 Simon Josefsson <jas@extundo.com>
* lisp/gnus/imap.el (imap-gssapi-program): Align command line parameters
with latest GNU SASL.
(imap-gssapi-open): Ignore 'Trying ...' messages from GNU SASL.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 25 Oct 2005 23:34:40 +0000 |
parents | fafd692d1e40 |
children | 68bb9e8a5390 |
line wrap: on
line diff
--- a/lisp/gnus/imap.el Tue Oct 25 23:24:47 2005 +0000 +++ b/lisp/gnus/imap.el Tue Oct 25 23:34:40 2005 +0000 @@ -182,8 +182,7 @@ :type '(repeat string)) (defcustom imap-gssapi-program (list - (concat "gsasl --client --connect %s:%p " - "--imap --application-data " + (concat "gsasl %s %p " "--mechanism GSSAPI " "--authentication-id %l") "imtest -m gssapi -u %l -p %p %s") @@ -600,6 +599,10 @@ (or (not (looking-at "S: ")) (forward-char 3) t) + ;; GNU SASL may print 'Trying ...' first. + (or (not (looking-at "Trying ")) + (forward-line) + t) (not (and (imap-parse-greeting) ;; success in imtest 1.6: (re-search-forward