[Emacs-diffs] Changes to emacs/lisp/gnus/imap.el

[Miles Bader]

Index: emacs/lisp/gnus/imap.el
diff -c emacs/lisp/gnus/imap.el:1.23 emacs/lisp/gnus/imap.el:1.24
*** emacs/lisp/gnus/imap.el:1.23        Sat Aug  6 19:51:42 2005
--- emacs/lisp/gnus/imap.el     Tue Oct 25 23:34:40 2005
***************
*** 182,189 ****
    :type '(repeat string))
  
  (defcustom imap-gssapi-program (list
!                               (concat "gsasl --client --connect %s:%p "
!                                       "--imap --application-data "
                                        "--mechanism GSSAPI "
                                        "--authentication-id %l")
                                "imtest -m gssapi -u %l -p %p %s")
--- 182,188 ----
    :type '(repeat string))
  
  (defcustom imap-gssapi-program (list
!                               (concat "gsasl %s %p "
                                        "--mechanism GSSAPI "
                                        "--authentication-id %l")
                                "imtest -m gssapi -u %l -p %p %s")
***************
*** 599,604 ****
--- 598,607 ----
                        ;; cyrus 1.6 imtest print "S: " before server greeting
                        (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: