Synch to Gnus 200305231439.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e0f2736..2055cac 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2003-05-23  Simon Josefsson  <jas@extundo.com>
+
+       * mml1991.el (mml1991-pgg-sign): Use mml-sender instead of
+       message-sender.
+
+       * 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 f5ad64e..a93ae9b 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1433,7 +1433,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 8f5204f..91dbcd1 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1525,6 +1525,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

diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index a687d75..d7948b8 100644 (file)
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -234,7 +234,7 @@
       (delete-region (point-min) (point)))
     (quoted-printable-decode-region (point-min) (point-max))
     (unless (let ((pgg-default-user-id
-                  (or (message-options-get 'message-sender)
+                  (or (message-options-get 'mml-sender)
                       pgg-default-user-id)))
              (pgg-sign-region (point-min) (point-max) t))
       (pop-to-buffer pgg-errors-buffer)