Commit 95ddf442 authored by Glenn Morris's avatar Glenn Morris
Browse files

* lisp/net/socks.el: Require network-stream.

Fixes: debbugs:10599
parent 0fd2c9a3
2012-02-17 Glenn Morris <>
* net/socks.el: Require network-stream. (Bug#10599)
2012-02-17 Kenichi Handa <>
* international/charprop.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
(require 'network-stream)
(if (fboundp 'socks-original-open-network-stream)
nil ; Do nothing, we've been here already
(defalias 'socks-original-open-network-stream
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment