From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel,gmane.emacs.gnus.general Subject: merge emacs Gnus changes -> Gnus 5.10.6 branch Date: Fri, 10 Sep 2004 16:12:15 +0900 Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Message-ID: Reply-To: Miles Bader NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1094800385 29606 80.91.224.253 (10 Sep 2004 07:13:05 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 10 Sep 2004 07:13:05 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Sep 10 09:12:54 2004 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1C5faX-0006Vc-00 for ; Fri, 10 Sep 2004 09:12:54 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1C5ffu-0002ex-Cj for ged-emacs-devel@m.gmane.org; Fri, 10 Sep 2004 03:18:26 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1C5ffm-0002ep-Hu for emacs-devel@gnu.org; Fri, 10 Sep 2004 03:18:18 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1C5ffk-0002ec-Tu for emacs-devel@gnu.org; Fri, 10 Sep 2004 03:18:18 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1C5ffk-0002eZ-Q4 for emacs-devel@gnu.org; Fri, 10 Sep 2004 03:18:16 -0400 Original-Received: from [202.32.8.214] (helo=tyo201.gate.nec.co.jp) by monty-python.gnu.org with esmtp (Exim 4.34) id 1C5faC-0007Wk-3o; Fri, 10 Sep 2004 03:12:32 -0400 Original-Received: from mailgate3.nec.co.jp (mailgate53.nec.co.jp [10.7.69.162] (may be forged)) by tyo201.gate.nec.co.jp (8.11.7/3.7W01080315) with ESMTP id i8A7CMA17646; Fri, 10 Sep 2004 16:12:23 +0900 (JST) Original-Received: (from root@localhost) by mailgate3.nec.co.jp (8.11.7/3.7W-MAILGATE-NEC) id i8A7CLY04313; Fri, 10 Sep 2004 16:12:21 +0900 (JST) Original-Received: from edtmg01.lsi.nec.co.jp ([10.26.16.201]) by mailsv3.nec.co.jp (8.11.7/3.7W-MAILSV4-NEC) with ESMTP id i8A7CIW21875; Fri, 10 Sep 2004 16:12:19 +0900 (JST) Original-Received: from mcsss2.ucom.lsi.nec.co.jp (localhost [127.0.0.1]) by edtmg01.lsi.nec.co.jp (8.12.10/8.12.10) with ESMTP id i8A7CHZT009986; Fri, 10 Sep 2004 16:12:17 +0900 (JST) Original-Received: from mctpc71 (mctpc71.ucom.lsi.nec.co.jp [10.30.118.121]) by mcsss2.ucom.lsi.nec.co.jp (8.12.10/8.12.8/EDcg v2.01-mc/1046780839) with ESMTP id i8A7CGwt001179; Fri, 10 Sep 2004 16:12:16 +0900 (JST) Original-Received: by mctpc71 (Postfix, from userid 31295) id 17E6E617; Fri, 10 Sep 2004 16:12:16 +0900 (JST) Original-To: ding@gnus.org System-Type: i686-pc-linux-gnu Blat: Foop Original-Lines: 25 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 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 Xref: main.gmane.org gmane.emacs.devel:26945 gmane.emacs.gnus.general:58436 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:26945 I've merged Stefan's post-5.10-merge Gnus changes from the Emacs trunk into the Gnus v5-10 branch (they all look pretty reasonable to my quick eyeballing). I'll merge any future Emacs Gnus changes similarly into the Gnus v5-10 branch unless they seem questionable (by the eyeball test), in which case I'll try to ask on the ding list. I've also done a test-merge of these and other v5-10 changes into a local copy of the Gnus CVS trunk. There are a few conflicts I'm going to look at more closely (e.g., lots of duplicate ChangeLog entries because of previous duplicate commits to the v5-10 branch and the branch), but I think most of these are straight-forward and uncontroversial; I'll post a patch with anything I'm not sure about. My intent with this is to essentially keep both the v5-10 branch and Gnus CVS trunk as close to a `plop into Emacs' state as possible, with deviations explicitly kept track of. Thanks, -Miles -- `Suppose Korea goes to the World Cup final against Japan and wins,' Moon said. `All the past could be forgiven.' [NYT]