Re: Patch to rmail.el and sendmail.el needs to go in 24.1.

[Paul Eggert <eggert@cs.ucla.edu>]

On 04/18/2012 11:25 AM, Richard Stallman wrote:
>     > Since it avoids a dangerous bug, it ought to go in 24.1.
>     > Can someone please put it there?

I tried to do that, but the patch collides with a recent
patch that was recently applied to the 24.1 branch
(please see below for a copy of the colliding patch).
Since I don't understand the code I left it alone;
perhaps you or Chong can comment when you have the time.


=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2012-04-15 08:49:24 +0000
+++ lisp/ChangeLog	2012-04-16 10:11:45 +0000
@@ -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

=== modified file 'lisp/mail/sendmail.el'
--- lisp/mail/sendmail.el	2012-04-03 10:21:47 +0000
+++ lisp/mail/sendmail.el	2012-04-16 10:11:45 +0000
@@ -864,7 +864,7 @@
     (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))))