Use open-network-stream instead of open-protocol-stream

* lisp/gnus/nnimap.el: Use open-network-stream instead of
open-protocol-stream.

* lisp/gnus/nntp.el: Ditto.

* lisp/gnus/pop3.el: Ditto.

* lisp/gnus/sieve-manage.el: Ditto.

* lisp/net/network-stream.el (open-protocol-stream): Make obsolete.

4 files changed, 4 insertions, 23 deletions

diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 0e8fb669082..66096ff2367 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -26,13 +26,6 @@
 
 ;;; Code:
 
-(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)))
-
 (eval-when-compile
   (require 'cl))
 
@@ -424,7 +417,7 @@ textual parts.")
       (when nnimap-server-port
 	(push nnimap-server-port ports))
       (let* ((stream-list
-	      (open-protocol-stream
+	      (open-network-stream
 	       "*nnimap*" (current-buffer) nnimap-address
 	       (nnimap-map-port (car ports))
 	       :type nnimap-stream
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index e6483c2046a..fa5f0e6c582 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -25,12 +25,6 @@
 
 ;;; Code:
 
-(eval-and-compile
-  ;; In Emacs 24, `open-protocol-stream' is an autoloaded alias for
-  ;; `make-network-stream'.
-  (unless (fboundp 'open-protocol-stream)
-    (require 'proto-stream)))
-
 (require 'nnheader)
 (require 'nnoo)
 (require 'gnus-util)
@@ -1266,7 +1260,7 @@ If SEND-IF-FORCE, only send authinfo to the server if the
 			   (nntp-open-ssl-stream tls)
 			   (nntp-open-tls-stream tls))))
 		(if (assoc nntp-open-connection-function map)
-		    (open-protocol-stream
+		    (open-network-stream
 		     "nntpd" pbuffer nntp-address nntp-port-number
 		     :type (cadr (assoc nntp-open-connection-function map))
 		     :end-of-command "^\\([2345]\\|[.]\\).*\n"
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index 0b1f5c89d3e..1695bbd3a40 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -34,12 +34,6 @@
 
 (eval-when-compile (require 'cl))
 
-(eval-and-compile
-  ;; In Emacs 24, `open-protocol-stream' is an autoloaded alias for
-  ;; `make-network-stream'.
-  (unless (fboundp 'open-protocol-stream)
-    (require 'proto-stream)))
-
 (require 'mail-utils)
 (defvar parse-time-months)
 
@@ -545,7 +539,7 @@ Returns the process associated with the connection."
       (erase-buffer)
       (setq pop3-read-point (point-min))
       (setq result
-	    (open-protocol-stream
+	    (open-network-stream
 	     "POP" (current-buffer) mailhost port
 	     :type (cond
 		    ((or (eq pop3-stream-type 'ssl)
diff --git a/lisp/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el
index dd503c347c9..695bbd860de 100644
--- a/lisp/gnus/sieve-manage.el
+++ b/lisp/gnus/sieve-manage.el
@@ -201,7 +201,7 @@ Return the buffer associated with the connection."
     (sieve-manage-erase)
     (setq sieve-manage-state 'initial)
     (destructuring-bind (proc . props)
-        (open-protocol-stream
+        (open-network-stream
          "SIEVE" buffer server port
          :type stream
          :capability-command "CAPABILITY\r\n"