]> git.eshelyaron.com Git - emacs.git/commitdiff
Remove Emacs 22 compat code from dns.el
authorStefan Kangas <stefankangas@gmail.com>
Wed, 12 Aug 2020 23:39:53 +0000 (01:39 +0200)
committerStefan Kangas <stefankangas@gmail.com>
Wed, 12 Aug 2020 23:39:53 +0000 (01:39 +0200)
* lisp/net/dns.el (dns-servers-up-to-date-p, dns-set-servers):
Remove check for function that is always there.

lisp/net/dns.el

index c3c294395cbf301a1d1ec27fbfb706ccb151941c..c368cd773c27e221465d1d5ed806f308d884b455 100644 (file)
@@ -316,8 +316,6 @@ If TCP-P, the first two bytes of the packet will be the length field."
   "Return false if we need to recheck the list of DNS servers."
   (and dns-servers
        (or (eq dns-servers-valid-for-interfaces t)
-          ;; `network-interface-list' was introduced in Emacs 22.1.
-          (not (fboundp 'network-interface-list))
           (equal dns-servers-valid-for-interfaces
                  (network-interface-list)))))
 
@@ -339,8 +337,7 @@ Parses \"/etc/resolv.conf\" or calls \"nslookup\"."
           (when (re-search-forward
           "^Address:[ \t]*\\([0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+\\|[[:xdigit:]:]*\\)" nil t)
              (setq dns-servers (list (match-string 1)))))))
-  (when (fboundp 'network-interface-list)
-    (setq dns-servers-valid-for-interfaces (network-interface-list))))
+  (setq dns-servers-valid-for-interfaces (network-interface-list)))
 
 (defun dns-read-txt (string)
   (if (> (length string) 1)