shr.el (shr-put-image): Silence compiler

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d8d6289..ce46726 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-05-30  Glenn Morris  <rgm@gnu.org>
 
+       * 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 28b2836..5be449e 100644 (file)
--- 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)) "")))))