emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 63b7697: Remove Emacs 22 compat code from dns.el


From: Stefan Kangas
Subject: master 63b7697: Remove Emacs 22 compat code from dns.el
Date: Wed, 12 Aug 2020 19:49:32 -0400 (EDT)

branch: master
commit 63b7697a677260c21730440d797763b442622d95
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Remove Emacs 22 compat code from dns.el
    
    * 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 | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lisp/net/dns.el b/lisp/net/dns.el
index c3c2943..c368cd7 100644
--- a/lisp/net/dns.el
+++ b/lisp/net/dns.el
@@ -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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]