aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReiner Steib2009-04-28 16:57:53 +0000
committerReiner Steib2009-04-28 16:57:53 +0000
commit9cc20f6c21f03cbd4e58785648f119f1bb370588 (patch)
tree7dd4a20f1eccf8035365240e709e6c67303909a6
parent4dc5a19d8b363379bf92a342023ed59877396cc5 (diff)
downloademacs-9cc20f6c21f03cbd4e58785648f119f1bb370588.tar.gz
emacs-9cc20f6c21f03cbd4e58785648f119f1bb370588.zip
Use dns-query instead of query-dns. Was renamed on 2008-12-25 in dns.el.
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/spam.el10
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 82cd077d0db..de21ccf716c 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
12009-04-28 Reiner Steib <Reiner.Steib@gmx.de>
2
3 * spam.el: Use dns-query instead of query-dns. Was renamed on
4 2008-12-25 in dns.el.
5
12009-04-20 Stefan Monnier <monnier@iro.umontreal.ca> 62009-04-20 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * rfc2047.el (rfc2047-decode-region): Don't skip past `start', which 8 * rfc2047.el (rfc2047-decode-region): Don't skip past `start', which
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index b7d1a13b697..c315f2f0347 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -73,8 +73,8 @@
73(autoload 'gnus-registry-store-extra-entry "gnus-registry") 73(autoload 'gnus-registry-store-extra-entry "gnus-registry")
74(autoload 'gnus-registry-fetch-extra "gnus-registry") 74(autoload 'gnus-registry-fetch-extra "gnus-registry")
75 75
76;; autoload query-dns 76;; autoload dns-query
77(autoload 'query-dns "dns") 77(autoload 'dns-query "dns")
78 78
79;;}}} 79;;}}}
80 80
@@ -173,7 +173,7 @@ The regular expression is matched against the address."
173 :group 'spam) 173 :group 'spam)
174 174
175(defcustom spam-use-dig t 175(defcustom spam-use-dig t
176 "Whether `query-dig' should be used instead of `query-dns'." 176 "Whether `query-dig' should be used instead of `dns-query'."
177 :type 'boolean 177 :type 'boolean
178 :group 'spam) 178 :group 'spam)
179 179
@@ -2038,9 +2038,9 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
2038 (push (list ip server query-result) 2038 (push (list ip server query-result)
2039 matches))) 2039 matches)))
2040 ;; else, if not using dig.el 2040 ;; else, if not using dig.el
2041 (when (query-dns query-string) 2041 (when (dns-query query-string)
2042 (gnus-message 6 "positive blackhole check") 2042 (gnus-message 6 "positive blackhole check")
2043 (push (list ip server (query-dns query-string 'TXT)) 2043 (push (list ip server (dns-query query-string 'TXT))
2044 matches))))))))) 2044 matches)))))))))
2045 (when matches 2045 (when matches
2046 spam-split-group))) 2046 spam-split-group)))