comparison lisp/net/socks.el @ 86534:1863c4982b31

(socks-original-open-network-stream): Declare as function. Move definition before use.
author Glenn Morris <rgm@gnu.org>
date Wed, 28 Nov 2007 04:04:21 +0000
parents 716b4c75ab5f
children 107ccd98fa12
comparison
equal deleted inserted replaced
86533:59b6ce989ba4 86534:1863c4982b31
333 ) 333 )
334 ) 334 )
335 ) 335 )
336 ) 336 )
337 337
338 (declare-function socks-original-open-network-stream "socks") ; fset
339
340 (defvar socks-override-functions nil
341 "*Whether to overwrite the open-network-stream function with the SOCKSified
342 version.")
343
344 (if (fboundp 'socks-original-open-network-stream)
345 nil ; Do nothing, we've been here already
346 (defalias 'socks-original-open-network-stream
347 (symbol-function 'open-network-stream))
348 (if socks-override-functions
349 (defalias 'open-network-stream 'socks-open-network-stream)))
350
338 (defun socks-open-connection (server-info) 351 (defun socks-open-connection (server-info)
339 (interactive) 352 (interactive)
340 (save-excursion 353 (save-excursion
341 (let ((proc (socks-original-open-network-stream "socks" 354 (let ((proc (socks-original-open-network-stream "socks"
342 nil 355 nil
471 (setq route nil 484 (setq route nil
472 noproxy nil))) 485 noproxy nil)))
473 (setq noproxy (cdr noproxy))) 486 (setq noproxy (cdr noproxy)))
474 route)) 487 route))
475 488
476 (defvar socks-override-functions nil
477 "*Whether to overwrite the open-network-stream function with the SOCKSified
478 version.")
479
480 (if (fboundp 'socks-original-open-network-stream)
481 nil ; Do nothing, we've been here already
482 (defalias 'socks-original-open-network-stream
483 (symbol-function 'open-network-stream))
484 (if socks-override-functions
485 (defalias 'open-network-stream 'socks-open-network-stream)))
486
487 (defvar socks-services-file "/etc/services") 489 (defvar socks-services-file "/etc/services")
488 (defvar socks-tcp-services (make-hash-table :size 13 :test 'equal)) 490 (defvar socks-tcp-services (make-hash-table :size 13 :test 'equal))
489 (defvar socks-udp-services (make-hash-table :size 13 :test 'equal)) 491 (defvar socks-udp-services (make-hash-table :size 13 :test 'equal))
490 492
491 (defun socks-parse-services () 493 (defun socks-parse-services ()