From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/68092 Path: news.gmane.org!not-for-mail From: Tassilo Horn Newsgroups: gmane.emacs.gnus.general Subject: Re: Small docstring bug in `gnus-treat-display-face' Date: Tue, 06 Jan 2009 12:30:40 +0100 Message-ID: <87wsd8y8m7.fsf@thinkpad.tsdh.de> References: <871vvhkd7g.fsf@thinkpad.tsdh.de> <877i59sbqt.fsf@marauder.physik.uni-ulm.de> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1231241506 20733 80.91.229.12 (6 Jan 2009 11:31:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 6 Jan 2009 11:31:46 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M16537@lists.math.uh.edu Tue Jan 06 12:32:56 2009 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by lo.gmane.org with esmtp (Exim 4.50) id 1LKAB4-0002Y7-Dr for ding-account@gmane.org; Tue, 06 Jan 2009 12:32:54 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1LKA93-000332-BS; Tue, 06 Jan 2009 05:30:49 -0600 Original-Received: from mx1.math.uh.edu ([129.7.128.32]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1LKA92-00032m-1C for ding@lists.math.uh.edu; Tue, 06 Jan 2009 05:30:48 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx1.math.uh.edu with esmtp (Exim 4.69) (envelope-from ) id 1LKA8w-0006kf-TQ for ding@lists.math.uh.edu; Tue, 06 Jan 2009 05:30:47 -0600 Original-Received: from deliver.uni-koblenz.de ([141.26.64.15]) by quimby.gnus.org with esmtp (Exim 3.36 #1 (Debian)) id 1LKA9D-0007Up-00 for ; Tue, 06 Jan 2009 12:30:59 +0100 Original-Received: from localhost (localhost [127.0.0.1]) by deliver.uni-koblenz.de (Postfix) with ESMTP id 84F8B789AD57 for ; Tue, 6 Jan 2009 12:30:41 +0100 (CET) Original-Received: from deliver.uni-koblenz.de ([127.0.0.1]) by localhost (deliver.uni-koblenz.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 19727-04 for ; Tue, 6 Jan 2009 12:30:40 +0100 (CET) X-CHKRCPT: Envelopesender vrfy tassilo@member.fsf.org Original-Received: from thinkpad.tsdh.de (dhcp128.uni-koblenz.de [141.26.71.128]) by deliver.uni-koblenz.de (Postfix) with ESMTP id 6CCAA789AD42 for ; Tue, 6 Jan 2009 12:30:40 +0100 (CET) Mail-Copies-To: never Mail-Followup-To: ding@gnus.org In-Reply-To: <877i59sbqt.fsf@marauder.physik.uni-ulm.de> (Reiner Steib's message of "Mon, 05 Jan 2009 22:07:22 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) X-Virus-Scanned: amavisd-new at uni-koblenz.de X-Spam-Score: -5.6 (-----) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:68092 Archived-At: Reiner Steib writes: Hi Reiner, >> I'd fix it on my own, but I'm not sure how to do that best. I don't >> have the Gnus repository checked out and use Emacs 23 from CVS with >> the bundled Gnus version. Would it be ok to fix it in Emacs CVS, >> both in HEAD and EMACS_22 branch? And if yes, would I make the >> changes manually in each branch or only in one and merge it to the >> other one? > > Just commit it to Emacs trunk. Ok, I'll do so. > Previously such changes should have been made only in one of the > stable branches (Gnus v5-10 branch or Emacs_22). (Additionally adding > it to the trunk was fine as well.) > > But now, the Emacs 22 branch has been retired, AFAIK. We will do a > final 5.10.* release from v5-10, 5.10.12, soon. Thereafter we will > retire the v5-10 branch as well (we could still use it for in case of > an emergency release, e.g. security fix). Ok. >> Does CVS have merge support anyway? > > Quite limited. But synching is done semi-automatically by Miles Bader > via Arch. See emacs/doc/misc/gnus-coding.texi or > gnus/texi/gnus-coding.texi (not yet updated for the post-Emacs-22 / > post-Gnus-5.10 time). Exactly, and I guess the Emacs HEAD is synched with the Gnus HEAD, but I wasn't sure if the EMACS_22 branch was synched with v5-10 as well. But since both branches are to be retired anyway, that's no deal. Bye, Tassilo