From: Glenn Morris Date: Wed, 25 Apr 2018 01:13:00 +0000 (-0400) Subject: socks.el: remove pre-21 compatibility code X-Git-Tag: emacs-27.0.90~5098 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cab400aacde04e4455caea4a6525b26ca7909850;p=emacs.git socks.el: remove pre-21 compatibility code * lisp/net/socks.el (socks-split-string): Remove. (socks-nslookup-host): Just use split-string. --- 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 @@ (require 'wid-edit)) (require 'custom) -(eval-and-compile - (if (featurep 'emacs) - (defalias 'socks-split-string 'split-string) ; since at least 21.1 - (if (fboundp 'split-string) - (defalias 'socks-split-string 'split-string) - (defun socks-split-string (string &optional pattern) - "Return a list of substrings of STRING which are separated by PATTERN. -If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"." - (or pattern - (setq pattern "[ \f\t\n\r\v]+")) - (let (parts (start 0)) - (while (string-match pattern string start) - (setq parts (cons (substring string start - (match-beginning 0)) parts) - start (match-end 0))) - (nreverse (cons (substring string start) parts))))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Custom widgets ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -652,7 +636,7 @@ version.") (setq res (buffer-substring (match-beginning 2) (match-end 2)) res (mapcar 'string-to-number - (socks-split-string res "\\."))))) + (split-string res "\\."))))) (kill-buffer (current-buffer))) res) host))