Synch to No Gnus 200407161522.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d629dc5..8deada9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-16  Jesper Harder  <harder@ifa.au.dk>
+
+       * message.el (message-clone-locals): Clone sendmail and smtp
+       variables.
+
 2004-07-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * rfc2047.el (rfc2047-encode-region): Fix last change.

diff --git a/lisp/message.el b/lisp/message.el
index afac1f8..314e546 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -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)