gnus-art.el (gnus-use-idna): Check if idna-program is installed.

message.el (message-use-idna): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e0f2736..26ce71c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-23  Simon Josefsson  <jas@extundo.com>
+
+       * gnus-art.el (gnus-use-idna): Check if idna-program is installed.
+
+       * message.el (message-use-idna): Ditto.
+
 2003-05-20  Dave Love  <fx@gnu.org>
 
        * rfc2047.el (rfc2047-q-encoding-alist): Deleted.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index d8121ff..c9f5698 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1324,7 +1324,8 @@ It is a string, such as \"PGP\". If nil, ask user."
   "Function used for converting HTML into text.")
 
 (defcustom gnus-use-idna (and (condition-case nil (require 'idna) (file-error))
-                             (mm-coding-system-p 'utf-8))
+                             (mm-coding-system-p 'utf-8)
+                             (executable-find idna-program))
   "Whether IDNA decoding of headers is used when viewing messages.
 This requires GNU Libidn, and by default only enabled if it is found."
   :group 'gnus-article-headers

diff --git a/lisp/message.el b/lisp/message.el
index b1f66e7..c0c7952 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1309,6 +1309,7 @@ no, only reply back to the author."
 (defcustom message-use-idna (and (condition-case nil (require 'idna)
                                   (file-error))
                                 (mm-coding-system-p 'utf-8)
+                                (executable-find idna-program)
                                 'ask)
   "Whether to encode non-ASCII in domain names into ASCII according to IDNA."
   :group 'message-headers