Disable ecomplete address storage when resending messages, to avoid

storing irrelevant addresses in your address book.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 40576a5..dcf658f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2010-08-28  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * message.el (message-inhibit-ecomplete): New variable to allow some
+       function to inhibit ecomplete address storage.
+       (message-resend): Disable ecomplete message storage when resending
+       messages.
+
        * nntp.el (nntp-async-kluge): Remove the Emacs 20.3-related kluge. 
 
 2010-08-27  Katsumi Yamaoka  <yamaoka@jpl.org>

diff --git a/lisp/message.el b/lisp/message.el
index beb9d16..70c83fc 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1712,6 +1712,7 @@ You must have the \"hashcash\" binary installed, see `hashcash-path'."
 (defvar message-mime-part nil)
 (defvar message-posting-charset nil)
 (defvar message-inserted-headers nil)
+(defvar message-inhibit-ecomplete nil)
 
 ;; Byte-compiler warning
 (defvar gnus-active-hashtb)
@@ -4064,7 +4065,8 @@ It should typically alter the sending method in some way or other."
        (run-hooks 'message-sent-hook))
       (message "Sending...done")
       ;; Do ecomplete address snarfing.
-      (when (message-mail-alias-type-p 'ecomplete)
+      (when (and (message-mail-alias-type-p 'ecomplete)
+                (not message-inhibit-ecomplete))
        (message-put-addresses-in-ecomplete))
       ;; Mark the buffer as unmodified and delete auto-save.
       (set-buffer-modified-p nil)
@@ -7398,6 +7400,7 @@ is for the internal use."
        (replace-match "X-From-Line: "))
       ;; Send it.
       (let ((message-inhibit-body-encoding t)
+           (message-inhibit-ecomplete t)
            message-required-mail-headers
            message-generate-hashcash
            rfc2047-encode-encoded-words)