summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Henoch <mange@freemail.hu>2006-10-29 21:00:50 +0000
committerMagnus Henoch <mange@freemail.hu>2006-10-29 21:00:50 +0000
commit080234b6930bbc83ffd60629a7da411881e156cc (patch)
tree53a71c2504dafffc16813d2bdc82b3a99a67f0bc
parent5d1b4ae30f287a5b6e9db59cbdd7ca5b00ed724a (diff)
downloademacs-080234b6930bbc83ffd60629a7da411881e156cc.tar.gz
(url-open-stream): Really use asynchronous connections (accidentally
disabled during debugging).
-rw-r--r--lisp/url/ChangeLog5
-rw-r--r--lisp/url/url-gw.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index d0df620c870..e63759f216a 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-29 Magnus Henoch <mange@freemail.hu>
+
+ * url-gw.el (url-open-stream): Really use asynchronous
+ connections (accidentally disabled during debugging).
+
2006-10-28 Magnus Henoch <mange@freemail.hu>
* url-http.el (url-http-parse-headers): Fix misplaced paren.
diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el
index 31e1a629aba..5197d894aa2 100644
--- a/lisp/url/url-gw.el
+++ b/lisp/url/url-gw.el
@@ -254,7 +254,7 @@ Might do a non-blocking connection; use `process-status' to check."
(make-network-process :name name :buffer buffer
:host host :service service
:nowait
- (and nil (featurep 'make-network-process '(:nowait t)))))
+ (featurep 'make-network-process '(:nowait t))))
(socks
(socks-open-network-stream name buffer host service))
(telnet