X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmessage.el;h=314e5462423b0cde28082dc3d4aa240a9b31a6be;hb=89f56733a4665ec857c04c45ebf14ddacf82747e;hp=e5e5e0e55411f14e2221336a9bda62663da3355b;hpb=dc4bc58b44cc33f364b45803d4965635a6c2eb2a;p=elisp%2Fgnus.git-

diff --git a/lisp/message.el b/lisp/message.el
index e5e5e0e..314e546 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5499,7 +5499,7 @@ subscribed address (and not the additional To and Cc header contents)."
     (when field
       (dolist (address (mail-header-parse-addresses field))
 	(setq address (car address)
-	      rhs (downcase (cadr (split-string address "@")))
+	      rhs (downcase (or (cadr (split-string address "@")) ""))
 	      ace (downcase (idna-to-ascii rhs)))
 	(when (and (not (equal rhs ace))
 		   (or (not (eq message-use-idna 'ask))
@@ -7442,8 +7442,7 @@ regexp VARSTR."
   (let ((locals (save-excursion
 		  (set-buffer buffer)
 		  (buffer-local-variables)))
-	(regexp
-	 "^\\(gnus\\|nn\\|message\\|user-\\(mail-address\\|full-name\\)\\)"))
+	(regexp "^gnus\\|^nn\\|^message\\|^sendmail\\|^smtp\\|^user-mail-address\\|^user-full-name"))
     (mapcar
      (lambda (local)
        (when (and (consp local)