From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/68083 Path: news.gmane.org!not-for-mail From: Reiner Steib Newsgroups: gmane.emacs.gnus.general Subject: Re: Small docstring bug in `gnus-treat-display-face' Date: Mon, 05 Jan 2009 22:07:22 +0100 Message-ID: <877i59sbqt.fsf@marauder.physik.uni-ulm.de> References: <871vvhkd7g.fsf@thinkpad.tsdh.de> Reply-To: Reiner Steib NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1231189684 14504 80.91.229.12 (5 Jan 2009 21:08:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 5 Jan 2009 21:08:04 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M16528@lists.math.uh.edu Mon Jan 05 22:09:15 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 1LJwh8-0004NU-Vb for ding-account@gmane.org; Mon, 05 Jan 2009 22:09:07 +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 1LJwfb-0007lM-Ra; Mon, 05 Jan 2009 15:07:31 -0600 Original-Received: from mx2.math.uh.edu ([129.7.128.33]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1LJwfa-0007kx-Bx for ding@lists.math.uh.edu; Mon, 05 Jan 2009 15:07:30 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx2.math.uh.edu with esmtp (Exim 4.69) (envelope-from ) id 1LJwfX-00010E-I2 for ding@lists.math.uh.edu; Mon, 05 Jan 2009 15:07:30 -0600 Original-Received: from mail.uni-ulm.de ([134.60.1.11]) by quimby.gnus.org with esmtp (Exim 3.36 #1 (Debian)) id 1LJwfn-0002lm-00 for ; Mon, 05 Jan 2009 22:07:43 +0100 Original-Received: from bridgekeeper.physik.uni-ulm.de (bridgekeeper.physik.uni-ulm.de [134.60.10.175]) by mail.uni-ulm.de (8.14.2/8.14.2) with ESMTP id n05L7QiP012153 for ; Mon, 5 Jan 2009 22:07:26 +0100 (MET) Original-Received: from localhost (localhost [127.0.0.1]) by bridgekeeper.physik.uni-ulm.de (Postfix) with ESMTP id DF99D1C921 for ; Mon, 5 Jan 2009 22:07:25 +0100 (CET) X-Face: mtjf/D:es1T0wHO:&CJ'ZXe"l;3C--rw\z!{`eFwL){|]RpI+4{u25L=5C /0>KuGeTsk<~<&NE-AKV1560e!+RJeyWmSskkrJm?[vUV#66{T_m|Ae<||Ku#Mk5`y&O`n~z2;n8eP J5#2h@2eQgV@E70IY_0WlEx!"&giy{+\%h1LJox$zv@/l%ZmU4^tZA>xQpnkUBVC5.jpg#0'(+2?Rs )NAr:>3<=WxHE$ktbLysDIM5TbmHu*3 (Tassilo Horn's message of "Mon, 05 Jan 2009 16:02:59 +0100") User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/22.1 (gnu/linux) X-DCC-SIHOPE-DCC-3-Metrics: poseidon 1085; Body=1 Fuz1=1 Fuz2=1 X-Virus-Scanned: by amavisd-new X-Spam-Score: -2.6 (--) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:68083 Archived-At: On Mon, Jan 05 2009, Tassilo Horn wrote: > 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. 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). > 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). Bye, Reiner. -- ,,, (o o) ---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/