aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2016-04-17 19:30:44 +0200
committerLars Magne Ingebrigtsen2016-04-17 19:30:44 +0200
commit84c4cc589ddd5fcd5bf5ca5256727255c4819043 (patch)
tree42b463158c04610636d520794b09972dc4542ac0
parent50b93f40d0d41ded6b9c0ee83574e828c869f62c (diff)
downloademacs-84c4cc589ddd5fcd5bf5ca5256727255c4819043.tar.gz
emacs-84c4cc589ddd5fcd5bf5ca5256727255c4819043.zip
Finish idna->puny changes in last Message patch
* lisp/gnus/message.el (message-idna-to-ascii-rhs-1): Use puny instead of idna functions.
-rw-r--r--lisp/gnus/message.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index fc339a4585f..1ca7c5cafef 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -48,6 +48,7 @@
48(require 'dired) 48(require 'dired)
49(require 'mm-util) 49(require 'mm-util)
50(require 'rfc2047) 50(require 'rfc2047)
51(require 'puny)
51 52
52(autoload 'mailclient-send-it "mailclient") 53(autoload 'mailclient-send-it "mailclient")
53 54
@@ -1910,7 +1911,6 @@ You must have the \"hashcash\" binary installed, see `hashcash-path'."
1910(autoload 'gnus-output-to-rmail "gnus-util") 1911(autoload 'gnus-output-to-rmail "gnus-util")
1911(autoload 'gnus-request-post "gnus-int") 1912(autoload 'gnus-request-post "gnus-int")
1912(autoload 'gnus-server-string "gnus") 1913(autoload 'gnus-server-string "gnus")
1913(autoload 'idna-to-ascii "idna")
1914(autoload 'message-setup-toolbar "messagexmas") 1914(autoload 'message-setup-toolbar "messagexmas")
1915(autoload 'mh-new-draft-name "mh-comp") 1915(autoload 'mh-new-draft-name "mh-comp")
1916(autoload 'mh-send-letter "mh-comp") 1916(autoload 'mh-send-letter "mh-comp")
@@ -5851,7 +5851,7 @@ subscribed address (and not the additional To and Cc header contents)."
5851 ;; the domain part, i.e., if it is a local user's address. 5851 ;; the domain part, i.e., if it is a local user's address.
5852 (setq ace (if (string-match "\\`[[:ascii:]]*\\'" rhs) 5852 (setq ace (if (string-match "\\`[[:ascii:]]*\\'" rhs)
5853 rhs 5853 rhs
5854 (downcase (idna-to-ascii rhs)))) 5854 (downcase (puny-encode-domain rhs))))
5855 (when (and (not (equal rhs ace)) 5855 (when (and (not (equal rhs ace))
5856 (or (not (eq message-use-idna 'ask)) 5856 (or (not (eq message-use-idna 'ask))
5857 (y-or-n-p (format "Replace %s with %s in %s:? " 5857 (y-or-n-p (format "Replace %s with %s in %s:? "