From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: Patch to rmail.el and sendmail.el needs to go in 24.1. Date: Wed, 18 Apr 2012 14:13:02 -0700 Organization: UCLA Computer Science Department Message-ID: <4F8F2E5E.9000005@cs.ucla.edu> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1334783603 13732 80.91.229.3 (18 Apr 2012 21:13:23 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 18 Apr 2012 21:13:23 +0000 (UTC) Cc: emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 18 23:13:20 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SKcBk-0007Vv-DL for ged-emacs-devel@m.gmane.org; Wed, 18 Apr 2012 23:13:20 +0200 Original-Received: from localhost ([::1]:38612 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKcBj-0007es-O0 for ged-emacs-devel@m.gmane.org; Wed, 18 Apr 2012 17:13:19 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:35550) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKcBe-0007dG-Re for emacs-devel@gnu.org; Wed, 18 Apr 2012 17:13:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKcBa-0004Ca-JH for emacs-devel@gnu.org; Wed, 18 Apr 2012 17:13:14 -0400 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:56681) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKcBa-0004CL-Db; Wed, 18 Apr 2012 17:13:10 -0400 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id A24B4A60004; Wed, 18 Apr 2012 14:13:07 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HKTURkPF82Ip; Wed, 18 Apr 2012 14:13:02 -0700 (PDT) Original-Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id DD09E39E800D; Wed, 18 Apr 2012 14:13:02 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:11.0) Gecko/20120329 Thunderbird/11.0.1 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 131.179.128.62 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:149784 Archived-At: 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 + + * mail/sendmail.el (mail-bury): Call return action with the right + Rmail buffer (Bug#11242). + 2012-04-15 Chong Yidong * 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))))