(message-idna-to-ascii-rhs-1): Don't call `idna-to-ascii'

if rhs is ASCII.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bfeb763..7c29666 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-01  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * message.el (message-idna-to-ascii-rhs-1): Don't call `idna-to-ascii'
+       if rhs is ASCII.
+
 2007-11-28  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * tls.el (tls-hostmismatch, open-tls-stream): Checkdoc cleanup.

diff --git a/lisp/message.el b/lisp/message.el
index ea997c2..6f5cd90 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5547,7 +5547,9 @@ subscribed address (and not the additional To and Cc header contents)."
                        (mapcar 'downcase
                                (mapcar
                                 'car (mail-header-parse-addresses field))))))
-       (setq ace (downcase (idna-to-ascii rhs)))
+       (setq ace (if (string-match "\\`[[:ascii:]]+\\'" rhs)
+                     rhs
+                   (downcase (idna-to-ascii rhs))))
        (when (and (not (equal rhs ace))
                   (or (not (eq message-use-idna 'ask))
                       (y-or-n-p (format "Replace %s with %s in %s:? "