From 85f5a3d86caf063b2c153acb1bdb6125abf3ca9e Mon Sep 17 00:00:00 2001
From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Sun, 3 Apr 2011 10:45:12 +0000
Subject: [PATCH] Fix previous commits.

---
 lisp/nnimap.el | 5 +----
 lisp/nntp.el   | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index afdea185d..44caaed34 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -32,10 +32,7 @@
 
 (eval-and-compile
   (require 'nnheader)
-  ;; In Emacs 24, `open-protocol-stream' is an autoloaded alias for
-  ;; `make-network-stream'.
-  (unless (fboundp 'open-protocol-stream)
-    (require 'proto-stream)))
+  (require 'network-stream))
 
 (eval-when-compile
   (require 'cl))
diff --git a/lisp/nntp.el b/lisp/nntp.el
index 3285da513..0689143c4 100644
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -28,10 +28,7 @@
 ;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
-  ;; In Emacs 24, `open-protocol-stream' is an autoloaded alias for
-  ;; `make-network-stream'.
-  (unless (fboundp 'open-protocol-stream)
-    (require 'proto-stream)))
+  (require 'network-stream))
 
 (require 'nnheader)
 (require 'nnoo)
-- 
2.34.1