diff options
| -rw-r--r-- | lisp/net/socks.el | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/lisp/net/socks.el b/lisp/net/socks.el index 32362e25434..1c2459a8e65 100644 --- a/lisp/net/socks.el +++ b/lisp/net/socks.el | |||
| @@ -36,22 +36,6 @@ | |||
| 36 | (require 'wid-edit)) | 36 | (require 'wid-edit)) |
| 37 | (require 'custom) | 37 | (require 'custom) |
| 38 | 38 | ||
| 39 | (eval-and-compile | ||
| 40 | (if (featurep 'emacs) | ||
| 41 | (defalias 'socks-split-string 'split-string) ; since at least 21.1 | ||
| 42 | (if (fboundp 'split-string) | ||
| 43 | (defalias 'socks-split-string 'split-string) | ||
| 44 | (defun socks-split-string (string &optional pattern) | ||
| 45 | "Return a list of substrings of STRING which are separated by PATTERN. | ||
| 46 | If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"." | ||
| 47 | (or pattern | ||
| 48 | (setq pattern "[ \f\t\n\r\v]+")) | ||
| 49 | (let (parts (start 0)) | ||
| 50 | (while (string-match pattern string start) | ||
| 51 | (setq parts (cons (substring string start | ||
| 52 | (match-beginning 0)) parts) | ||
| 53 | start (match-end 0))) | ||
| 54 | (nreverse (cons (substring string start) parts))))))) | ||
| 55 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 39 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| 56 | ;;; Custom widgets | 40 | ;;; Custom widgets |
| 57 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 41 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| @@ -652,7 +636,7 @@ version.") | |||
| 652 | (setq res (buffer-substring (match-beginning 2) | 636 | (setq res (buffer-substring (match-beginning 2) |
| 653 | (match-end 2)) | 637 | (match-end 2)) |
| 654 | res (mapcar 'string-to-number | 638 | res (mapcar 'string-to-number |
| 655 | (socks-split-string res "\\."))))) | 639 | (split-string res "\\."))))) |
| 656 | (kill-buffer (current-buffer))) | 640 | (kill-buffer (current-buffer))) |
| 657 | res) | 641 | res) |
| 658 | host)) | 642 | host)) |