From 64699a5ac88a63d5d96c0e3468207a82c84b68c2 Mon Sep 17 00:00:00 2001
From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Sun, 17 Apr 2016 19:14:01 +0200
Subject: [PATCH] Default `message-use-idna' to t

* lisp/gnus/message.el (message-use-idna): Default to t (since
Emacs comes with puny.el now).
---
 lisp/gnus/message.el | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 3b2cf672020..fc339a4585f 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1756,25 +1756,9 @@ no, only reply back to the author."
   :type '(radio (const :format "%v  " nil)
 		(string :format "FQDN: %v")))
 
-(defcustom message-use-idna
-  (and (or (mm-coding-system-p 'utf-8)
-	   (condition-case nil
-	       (let (mucs-ignore-version-incompatibilities)
-		 (require 'un-define))
-	     (error)))
-       (condition-case nil
-	   (require 'idna)
-	 (file-error)
-	 (invalid-operation))
-       idna-program
-       (executable-find idna-program)
-       (string= (idna-to-ascii "räksmörgås") "xn--rksmrgs-5wao1o")
-       t)
-  "Whether to encode non-ASCII in domain names into ASCII according to IDNA.
-GNU Libidn, and in particular the elisp package \"idna.el\" and
-the external program \"idn\", must be installed for this
-functionality to work."
-  :version "22.1"
+(defcustom message-use-idna t
+  "Whether to encode non-ASCII in domain names into ASCII according to IDNA."
+  :version "25.2"
   :group 'message-headers
   :link '(custom-manual "(message)IDNA")
   :type '(choice (const :tag "Ask" ask)
-- 
2.11.4.GIT