diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-04 23:45:27 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-04 23:45:27 -0700 |
| commit | ca23cc8840efb1354ebe16c6bb99bf1f8880e9b6 (patch) | |
| tree | e95220daac6b9ffb47966df747308a11c0623179 /lisp/gnus/nnimap.el | |
| parent | d5efd1d1b54595db795d6fddb32404cc74923d77 (diff) | |
| parent | b87a82007428428e2f24af64a59799402bb1651e (diff) | |
| download | emacs-ca23cc8840efb1354ebe16c6bb99bf1f8880e9b6.tar.gz emacs-ca23cc8840efb1354ebe16c6bb99bf1f8880e9b6.tar.bz2 emacs-ca23cc8840efb1354ebe16c6bb99bf1f8880e9b6.zip | |
Merge from mainline.
Diffstat (limited to 'lisp/gnus/nnimap.el')
| -rw-r--r-- | lisp/gnus/nnimap.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index fa09c7ff165..afdea185dd3 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -31,7 +31,11 @@ (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))) (eval-and-compile - (require 'nnheader)) + (require 'nnheader) + ;; In Emacs 24, `open-protocol-stream' is an autoloaded alias for + ;; `make-network-stream'. + (unless (fboundp 'open-protocol-stream) + (require 'proto-stream))) (eval-when-compile (require 'cl)) @@ -45,7 +49,6 @@ (require 'tls) (require 'parse-time) (require 'nnmail) -(require 'proto-stream) (autoload 'auth-source-forget+ "auth-source") (autoload 'auth-source-search "auth-source") @@ -365,6 +368,7 @@ textual parts.") :return-list t :shell-command nnimap-shell-program :capability-command "1 CAPABILITY\r\n" + :end-of-command "\r\n" :success " OK " :starttls-function (lambda (capabilities) |