Merge from origin/emacs-25

[gnu-emacs] / lisp / url / url-gw.el

diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el
index 460ee0dd4264c7477b0279350523c9411915cc96..d898368cf9eb003ce7b0d59445326653cb27a695 100644 (file)
--- a/lisp/url/url-gw.el
+++ b/lisp/url/url-gw.el
@@ -246,8 +246,8 @@ overriding the value of `url-gateway-method'."
                           :type gw-method
                           ;; Use non-blocking socket if we can.
                           :nowait (featurep 'make-network-process
-                                            '(:nowait t))))
-                        (`socks
+                                             '(:nowait t))))
+                         (`socks
                          (socks-open-network-stream name buffer host service))
                         (`telnet
                          (url-open-telnet name buffer host service))