* mail/sendmail.el (mail-bury): Call return action with the right Rmail buffer.

Fixes: debbugs:11242

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index db559581ec2..e1232eb52e5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-16  Chong Yidong  <cyd@gnu.org>
+
+        * mail/sendmail.el (mail-bury): Call return action with the right
+        Rmail buffer (Bug#11242).
+
 2012-04-15  Chong Yidong  <cyd@gnu.org>
 
         * server.el (server-process-filter): Handle corner case where both
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 933eaef8119..c4647d7893e 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -864,7 +864,7 @@ Prefix arg means don't delete this window."
     (unless return-action
       (dolist (buffer (buffer-list))
         (if (eq (buffer-local-value 'major-mode buffer) 'rmail-mode)
-            (setq return-action `(rmail-mail-return ,newbuf)))))
+            (setq return-action `(rmail-mail-return ,buffer)))))
     (if (and (null arg) return-action)
         (apply (car return-action) (cdr return-action))
       (switch-to-buffer newbuf))))