Small docstring bug in `gnus-treat-display-face'

Small docstring bug in `gnus-treat-display-face'

[Tassilo Horn]

Hi all,

the docs of

,----[ C-h v gnus-treat-display-face RET ]
| gnus-treat-display-face is a variable defined in `gnus-art.el'.
| Its value is head
| 
| Documentation:
| Display Face headers.
| Valid values are nil, t, `head', `first', `last', an integer or a
| predicate.  See Info node `(gnus)Customizing Articles' and Info
| node `(gnus)X-Face' for details.
| 
| You can customize this variable.
| 
| This variable was introduced, or its default value was changed, in
| version 22.1 of Emacs.
`----

contain a little bug.  The info link has to be `(gnus)Face', not
`(gnus)X-Face'.

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?  Does CVS
have merge support anyway?

Bye,
Tassilo

Re: Small docstring bug in `gnus-treat-display-face'

[Reiner Steib]

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/

Re: Small docstring bug in `gnus-treat-display-face'

[Tassilo Horn]

Reiner Steib <reinersteib+gmane@imap.cc> 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