diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-09 12:51:06 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-09 12:51:06 -0700 |
| commit | 9f46df23a3d01f82a24f2a3dd8730f0263fa9fde (patch) | |
| tree | e10467a42658a374d5cdb7bb25fc94016abdad7a /lisp/net/socks.el | |
| parent | b8df54ffbefc5ddf40ddcda68a2a682769c5833d (diff) | |
| parent | a130c2afed5e7d5ec10efa1a57f4de2461a9c778 (diff) | |
| download | emacs-9f46df23a3d01f82a24f2a3dd8730f0263fa9fde.tar.gz | |
Merge from trunk; add Bug#.
Diffstat (limited to 'lisp/net/socks.el')
| -rw-r--r-- | lisp/net/socks.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/net/socks.el b/lisp/net/socks.el index 3c94e7d1b22..306376f8af2 100644 --- a/lisp/net/socks.el +++ b/lisp/net/socks.el @@ -343,7 +343,7 @@ If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"." ;; 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 + "Whether to overwrite the open-network-stream function with the SOCKSified version.") (require 'network-stream) @@ -480,7 +480,7 @@ version.") ;; Replacement functions for open-network-stream, etc. (defvar socks-noproxy nil - "*List of regexps matching hosts that we should not socksify connections to") + "List of regexps matching hosts that we should not socksify connections to") (defun socks-find-route (host service) (let ((route socks-server) @@ -626,7 +626,7 @@ version.") (defcustom socks-nslookup-program "nslookup" - "*If non-NIL then a string naming the nslookup program." + "If non-NIL then a string naming the nslookup program." :type '(choice (const :tag "None" :value nil) string) :group 'socks) |