From 95ddf44200640d9b1ec9d52768044e709a860eec Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 17 Feb 2012 00:19:12 -0800 Subject: [PATCH] * lisp/net/socks.el: Require network-stream. Fixes: debbugs:10599 --- lisp/ChangeLog | 4 ++++ lisp/net/socks.el | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e2e45bf1535..4479ee22790 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-02-17 Glenn Morris + + * net/socks.el: Require network-stream. (Bug#10599) + 2012-02-17 Kenichi Handa * international/charprop.el: diff --git a/lisp/net/socks.el b/lisp/net/socks.el index b9431bdeed7..3c94e7d1b22 100644 --- a/lisp/net/socks.el +++ b/lisp/net/socks.el @@ -35,6 +35,8 @@ (require 'wid-edit)) (require 'custom) +;; FIXME this is bad practice, and who is it for anyway, since Emacs +;; has split-string since at least 21.1. (if (not (fboundp 'split-string)) (defun split-string (string &optional pattern) "Return a list of substrings of STRING which are separated by PATTERN. @@ -335,10 +337,17 @@ If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"." (declare-function socks-original-open-network-stream "socks") ; fset +;; FIXME this is a terrible idea. +;; It is not even compatible with the argument spec of open-network-stream +;; in 24.1. If this is really necessary, open-network-stream +;; could get a wrapper hook, or defer to open-network-stream-function. + (defvar socks-override-functions nil "*Whether to overwrite the open-network-stream function with the SOCKSified version.") +(require 'network-stream) + (if (fboundp 'socks-original-open-network-stream) nil ; Do nothing, we've been here already (defalias 'socks-original-open-network-stream -- 2.39.2