(open-protocol-stream): Renamed from open-proto-stream.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83b4297..102b5b5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-28  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * proto-stream.el (open-protocol-stream): Renamed from
+       open-proto-stream.
+
 2010-11-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * nnimap.el (nnimap-stream): Change default to `undecided'.

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 47d222d..4bdf96b 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -349,7 +349,7 @@ textual parts.")
       (when nnimap-server-port
        (push (format "%s" nnimap-server-port) ports))
       (destructuring-bind (stream greeting capabilities)
-         (open-proto-stream
+         (open-protocol-stream
           "*nnimap*" (current-buffer) nnimap-address (car (last ports))
           :type nnimap-stream
           :shell-command nnimap-shell-program

diff --git a/lisp/nntp.el b/lisp/nntp.el
index 098dff6..a90b171 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -1269,7 +1269,7 @@ password contained in '~/.nntp-authinfo'."
                           (nntp-open-ssl-stream tls)
                           (nntp-open-tls-stream tls))))
                (if (assoc nntp-open-connection-function map)
-                   (car (open-proto-stream
+                   (car (open-protocol-stream
                          "nntpd" pbuffer nntp-address nntp-port-number
                          :type (cadr
                                 (assoc nntp-open-connection-function map))

diff --git a/lisp/proto-stream.el b/lisp/proto-stream.el
index da6cab9..b50e4bc 100644 (file)
--- a/lisp/proto-stream.el
+++ b/lisp/proto-stream.el
@@ -36,7 +36,7 @@
 
 ;; Usage example:
 
-;; (open-proto-stream
+;; (open-protocol-stream
 ;;  "*nnimap*" buffer address port
 ;;  :type 'network
 ;;  :capability-command "1 CAPABILITY\r\n"
@@ -64,7 +64,7 @@
                  (proc type &optional priority-string trustfiles keyfiles))
 
 ;;;###autoload
-(defun open-proto-stream (name buffer host service &rest parameters)
+(defun open-protocol-stream (name buffer host service &rest parameters)
   "Open a network stream to HOST.
 The first four parameters have the same meaning as in
 `open-network-stream'.  The function returns a list where the