(open-network-stream): Take a :nowait parameter and pass it on to `make-network-process'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d0f08795ed3fc36199ef2897682ee9d02089540c..a111f30f6d5ef44d1f211bd516eb01aa50236db1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * net/network-stream.el (open-network-stream): Take a :nowait
+       parameter and pass it on to `make-network-process'.
+       (network-stream-open-plain): Ditto.
+
 2011-04-30  Andreas Schwab  <schwab@linux-m68k.org>
 
        * faces.el (face-spec-set-match-display): Don't match toolkit

diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index 09519e14870c9df9dd1f42c4b4daf3f5d7291ac0..2071f790656ee527ba8d3bbcb2a6902e8bfc11f1 100644 (file)
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -109,7 +109,10 @@ values:
 :starttls-function specifies a function for handling STARTTLS.
   This function should take one parameter, the response to the
   capability command, and should return the command to switch on
-  STARTTLS if the server supports STARTTLS, and nil otherwise."
+  STARTTLS if the server supports STARTTLS, and nil otherwise.
+
+:nowait is a boolean that says the connection should be made
+asynchronously, if possible."
   (unless (featurep 'make-network-process)
     (error "Emacs was compiled without networking support"))
   (let ((type (plist-get parameters :type))
@@ -121,7 +124,8 @@ values:
                                (plist-get parameters :capability-command))))))
        ;; The simplest case: wrapper around `make-network-process'.
        (make-network-process :name name :buffer buffer
-                             :host host :service service)
+                             :host host :service service
+                             :nowait (plist-get parameters :nowait))
       (let ((work-buffer (or buffer
                             (generate-new-buffer " *stream buffer*")))
            (fun (cond ((eq type 'plain) 'network-stream-open-plain)
@@ -150,10 +154,11 @@ values:
 (defun network-stream-open-plain (name buffer host service parameters)
   (let ((start (with-current-buffer buffer (point)))
        (stream (make-network-process :name name :buffer buffer
-                                     :host host :service service)))
+                                     :host host :service service
+                                     :nowait (plist-get parameters :nowait))))
     (list stream
          (network-stream-get-response stream start
-                                    (plist-get parameters :end-of-command))
+                                      (plist-get parameters :end-of-command))
          nil
          'plain)))