From c5f073e9dcab6689c65b14735b169a91d5997963 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 30 May 2013 06:34:24 +0000 Subject: [PATCH] shr.el (shr-put-image): Silence compiler --- lisp/ChangeLog | 3 +++ lisp/nnmail.el | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d8d6289ab..ce4672614 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2013-05-30 Glenn Morris + * nnmail.el (nnmail-fancy-expiry-target): + Also bind mail-dont-reply-to-names. + * spam-stat.el (spam-stat-save): No need to tweak font-lock in temp buffers. diff --git a/lisp/nnmail.el b/lisp/nnmail.el index 28b28369a..5be449e9a 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -1952,8 +1952,10 @@ If TIME is nil, then return the cutoff time for oldness instead." ((and (equal header 'to-from) (or (string-match (cadr regexp-target-pair) from) (and (string-match (cadr regexp-target-pair) to) - (let ((rmail-dont-reply-to-names - (message-dont-reply-to-names))) + (let* ((mail-dont-reply-to-names + (message-dont-reply-to-names)) + (rmail-dont-reply-to-names ; obsolete since 24.1 + mail-dont-reply-to-names)) (equal (if (fboundp 'rmail-dont-reply-to) (rmail-dont-reply-to from) (mail-dont-reply-to from)) ""))))) -- 2.25.1