summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorJulien Danjou <julien@danjou.info>2012-07-21 11:05:32 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2012-07-21 11:05:32 +0000
commit0fb40182ca2991975bb419199fa48bfc7d322dad (patch)
tree73416a1a1bfeaea5a8e0820348633c1b91e81993 /lisp
parentc4328746b51eb870cdf0b17a97b08a5eb0798fd2 (diff)
downloademacs-0fb40182ca2991975bb419199fa48bfc7d322dad.tar.gz
emacs-0fb40182ca2991975bb419199fa48bfc7d322dad.tar.bz2
emacs-0fb40182ca2991975bb419199fa48bfc7d322dad.zip
lisp/gnus/message.el: Replace deprecated rmail vars
Diffstat (limited to 'lisp')
-rw-r--r--lisp/gnus/ChangeLog6
-rw-r--r--lisp/gnus/message.el12
2 files changed, 12 insertions, 6 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 1e3d386476b..17e8006659f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-21 Julien Danjou <julien@danjou.info>
+
+ * message.el (message-dont-reply-to-names): Replace deprecated
+ `rmail-dont-reply-to-names' with `mail-dont-reply-to-names'.
+ (message-get-reply-headers): Ditto.
+
2012-07-18 Julien Danjou <julien@danjou.info>
* sieve-mode.el (sieve-mode-map): Bind C-c C-c to
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 21ce9e4a873..b4bad214043 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1332,11 +1332,11 @@ If nil, you might be asked to input the charset."
:type 'symbol)
(defcustom message-dont-reply-to-names
- (and (boundp 'rmail-dont-reply-to-names) rmail-dont-reply-to-names)
+ (and (boundp 'mail-dont-reply-to-names) mail-dont-reply-to-names)
"*Addresses to prune when doing wide replies.
This can be a regexp or a list of regexps. Also, a value of nil means
exclude your own user name only."
- :version "21.1"
+ :version "24.2"
:group 'message
:link '(custom-manual "(message)Wide Reply")
:type '(choice (const :tag "Yourself" nil)
@@ -1933,7 +1933,7 @@ You must have the \"hashcash\" binary installed, see `hashcash-path'."
(autoload 'nndraft-request-associate-buffer "nndraft")
(autoload 'nndraft-request-expire-articles "nndraft")
(autoload 'nnvirtual-find-group-art "nnvirtual")
-(autoload 'rmail-dont-reply-to "mail-utils")
+(autoload 'mail-dont-reply-to "mail-utils")
(autoload 'rmail-msg-is-pruned "rmail")
(autoload 'rmail-output "rmailout")
@@ -6802,9 +6802,9 @@ want to get rid of this query permanently.")))
;; Squeeze whitespace.
(while (string-match "[ \t][ \t]+" recipients)
(setq recipients (replace-match " " t t recipients)))
- ;; Remove addresses that match `rmail-dont-reply-to-names'.
- (let ((rmail-dont-reply-to-names (message-dont-reply-to-names)))
- (setq recipients (rmail-dont-reply-to recipients)))
+ ;; Remove addresses that match `mail-dont-reply-to-names'.
+ (let ((mail-dont-reply-to-names (message-dont-reply-to-names)))
+ (setq recipients (mail-dont-reply-to recipients)))
;; Perhaps "Mail-Copies-To: never" removed the only address?
(if (string-equal recipients "")
(setq recipients author))