[gnus git] branch master updated: n0-15-30-g85f5a3d =1= Fix previous commits.

       via  85f5a3d86caf063b2c153acb1bdb6125abf3ca9e (commit)
      from  aec172ccb68c9a5d3769c0d01d026c8a5740cf0a (commit)


- Log -----------------------------------------------------------------
commit 85f5a3d86caf063b2c153acb1bdb6125abf3ca9e
Author: Katsumi Yamaoka <[email protected]>
Date:   Sun Apr 3 10:45:12 2011 +0000

    Fix previous commits.

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index afdea18..44caaed 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 3285da5..0689143 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)

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

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

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project