[Emacs-diffs] /srv/bzr/emacs/trunk r107314: * lisp/net/socks.el: Require network-stream.

[Glenn Morris]

------------------------------------------------------------
revno: 107314
fixes bug(s): http://debbugs.gnu.org/10599
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-02-17 00:19:12 -0800
message:
  * lisp/net/socks.el: Require network-stream.
modified:
  lisp/ChangeLog
  lisp/net/socks.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-17 07:33:15 +0000
+++ b/lisp/ChangeLog    2012-02-17 08:19:12 +0000
@@ -1,3 +1,7 @@
+2012-02-17  Glenn Morris  <address@hidden>
+
+       * net/socks.el: Require network-stream.  (Bug#10599)
+
 2012-02-17  Kenichi Handa  <address@hidden>
 
        * international/charprop.el:

=== modified file 'lisp/net/socks.el'
--- a/lisp/net/socks.el 2012-01-19 07:21:25 +0000
+++ b/lisp/net/socks.el 2012-02-17 08:19:12 +0000
@@ -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 @@
 
 (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