[Emacs-diffs] emacs/lisp/gnus message.el

[Katsumi Yamaoka]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Katsumi Yamaoka <yamaoka>       08/12/03 23:49:01

Modified files:
        lisp/gnus      : message.el 

Log message:
        (message-idna-to-ascii-rhs-1): Fix previous commit.
        (message-idna-to-ascii-rhs): Add a comment.  Suggested by RMS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/message.el?cvsroot=emacs&r1=1.165&r2=1.166

Patches:
Index: message.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/message.el,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -b -r1.165 -r1.166
--- message.el  3 Dec 2008 03:00:41 -0000       1.165
+++ message.el  3 Dec 2008 23:49:00 -0000       1.166
@@ -5635,14 +5635,13 @@
       (dolist (rhs
               (mm-delete-duplicates
                (mapcar (lambda (rhs) (or (cadr (split-string rhs "@")) ""))
-                       (mapcar (lambda (domain)
-                                 (if domain
-                                     (downcase domain)
-                                   ""))
+                       (mapcar 'downcase
                                (mapcar
                                 'cadr
                                 (mail-extract-address-components field t))))))
-       (setq ace (if (string-match "\\`[[:ascii:]]+\\'" rhs)
+       ;; Note that `rhs' will be "" if the address does not have
+       ;; the domain part, i.e., if it is a local user's address.
+       (setq ace (if (string-match "\\`[[:ascii:]]*\\'" rhs)
                      rhs
                    (downcase (idna-to-ascii rhs))))
        (when (and (not (equal rhs ace))
@@ -5664,6 +5663,12 @@
   (when message-use-idna
     (save-excursion
       (save-restriction
+       ;; `message-narrow-to-head' that recognizes only the first empty
+       ;; line as the message header separator used to be used here.
+       ;; However, since there is the "--text follows this line--" line
+       ;; normally, it failed in narrowing to the headers and potentially
+       ;; caused the IDNA encoding on lines that look like headers in
+       ;; the message body.
        (message-narrow-to-headers-or-head)
        (message-idna-to-ascii-rhs-1 "From")
        (message-idna-to-ascii-rhs-1 "To")