summaryrefslogtreecommitdiff
path: root/lisp/gnus/message.el
diff options
context:
space:
mode:
authorKatsumi Yamaoka <yamaoka@jpl.org>2014-11-27 01:33:09 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2014-11-27 01:33:09 +0000
commitb121ef10f500c0377c2ce665e8ccd8b97a6aedfd (patch)
tree291656f96728a153bd7649303d870dbd07b28d6c /lisp/gnus/message.el
parent666e90e5ccef2d2b19428b6a5cb41a2efe7d46db (diff)
downloademacs-b121ef10f500c0377c2ce665e8ccd8b97a6aedfd.tar.gz
Gnus: fix XEmacs compilation
Diffstat (limited to 'lisp/gnus/message.el')
-rw-r--r--lisp/gnus/message.el18
1 files changed, 11 insertions, 7 deletions
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 0af47843d46..c1322154f19 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1756,13 +1756,17 @@ no, only reply back to the author."
:type '(radio (const :format "%v " nil)
(string :format "FQDN: %v")))
-(defcustom message-use-idna (and (condition-case nil (require 'idna)
- (file-error))
- (mm-coding-system-p 'utf-8)
- (executable-find idna-program)
- (string= (idna-to-ascii "räksmörgås")
- "xn--rksmrgs-5wao1o")
- t)
+(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))
+ 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