Merge from emacs--rel--22

[gnu-emacs] / lisp / net / socks.el

diff --git a/lisp/net/socks.el b/lisp/net/socks.el
index cad9391a5c8e07b9dc2e81cccd548c3485c2a73c..40020df9a1ca5d4a736ca9fdad74351b213f84db 100644 (file)
--- a/lisp/net/socks.el
+++ b/lisp/net/socks.el
@@ -248,7 +248,7 @@ If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"."
 (defun socks-build-auth-list ()
   (let ((num 0)
        (retval ""))
-    (mapcar
+    (mapc
      (function
       (lambda (x)
        (if (fboundp (cdr (cdr x)))
@@ -336,6 +336,19 @@ If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"."
     )
   )
 
+(declare-function socks-original-open-network-stream "socks") ; fset
+
+(defvar socks-override-functions nil
+  "*Whether to overwrite the open-network-stream function with the SOCKSified
+version.")
+
+(if (fboundp 'socks-original-open-network-stream)
+    nil                                ; Do nothing, we've been here already
+  (defalias 'socks-original-open-network-stream
+    (symbol-function 'open-network-stream))
+  (if socks-override-functions
+      (defalias 'open-network-stream 'socks-open-network-stream)))
+
 (defun socks-open-connection (server-info)
   (interactive)
   (save-excursion
@@ -474,17 +487,6 @@ If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"."
       (setq noproxy (cdr noproxy)))
     route))
 
-(defvar socks-override-functions nil
-  "*Whether to overwrite the open-network-stream function with the SOCKSified
-version.")
-
-(if (fboundp 'socks-original-open-network-stream)
-    nil                                ; Do nothing, we've been here already
-  (defalias 'socks-original-open-network-stream
-    (symbol-function 'open-network-stream))
-  (if socks-override-functions
-      (defalias 'open-network-stream 'socks-open-network-stream)))
-
 (defvar socks-services-file "/etc/services")
 (defvar socks-tcp-services (make-hash-table :size 13 :test 'equal))
 (defvar socks-udp-services (make-hash-table :size 13 :test 'equal))
@@ -547,7 +549,9 @@ version.")
                          atype
                          host
                          (if (stringp service)
-                             (socks-find-services-entry service)
+                             (or
+                              (socks-find-services-entry service)
+                              (error "Unknown service: %s" service))
                            service))
       (puthash 'buffer buffer info)
       (puthash 'host host info)