From c1b856a1845f899f05d7dada35878167c12c26bb Mon Sep 17 00:00:00 2001 From: Reiner Steib Date: Thu, 10 Nov 2005 18:27:47 +0000 Subject: [PATCH] (Gnus Coding Style): Add MIME subsection. (Gnus Maintainance Guide): Improvements. --- texi/ChangeLog | 3 + texi/gnus-coding.texi | 166 ++++++++++++++++++++++++++---------------- 2 files changed, 106 insertions(+), 63 deletions(-) diff --git a/texi/ChangeLog b/texi/ChangeLog index 628c45758..bcc90aebe 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,5 +1,8 @@ 2005-11-10 Reiner Steib + * gnus-coding.texi (Gnus Coding Style): Add MIME subsection. + (Gnus Maintainance Guide): Improvements. + * gnus.texi (Sorting the Summary Buffer): Replace 2005-10-29 change by a reference to `Group Parameters'. Use `(not ...)' in example instead of `lambda' expression. diff --git a/texi/gnus-coding.texi b/texi/gnus-coding.texi index 1c9cc556d..dfc240459 100644 --- a/texi/gnus-coding.texi +++ b/texi/gnus-coding.texi @@ -168,12 +168,21 @@ Message mode buffers. Message mode is intended to be a replacement for Emacs mail mode. There should be no Gnus dependencies in @file{message.el}. +@subsection Emacs @acronym{MIME} + +The files @file{mml*.el} and @file{mm-*.el} provide @acronym{MIME} +functionality for Emacs. + +@acronym{MML} (@acronym{MIME} Meta Language) is supposed to be +independent from Gnus. Alas it is not anymore. + + @subsection Gnus backends The files @file{nn*.el} provide functionality for accessing NNTP (@file{nntp.el}), IMAP (@file{nnimap.el}) and several other Mail back ends (probably @file{nnml.el}, @file{nnfolder.el} and -@file{nnmaildir.el} are the ones most widely used mail back ends). +@file{nnmaildir.el} are the most widely used mail back ends). @c message / gnus @@ -191,25 +200,42 @@ ends (probably @file{nnml.el}, @file{nnfolder.el} and @section Compatibility -@c Compatibility with XEmacs and older Emacs versions in v5-10 and in the -@c trunk. - -@c @table -@c x -@c @end table +@c Compatibility with XEmacs and older Emacs versions in v5-10 and in +@c the trunk. + +No Gnus should work on: +@itemize @bullet +@item +Emacs 21.1 and up. +@item +XEmacs 21.4 and up. +@end itemize + +Gnus 5.10 should work on: +@itemize @bullet +@item +Emacs 20.7 and up. +@item +XEmacs 21.1 and up. +@end itemize @node Gnus Maintainance Guide @chapter Gnus Maintainance Guide @section Stable and development versions -The CVS trunk is developed quite actively. - -@c Most of the time Gnus is developed on the trunk. - -@c Exeption: several month of feature freeze after a release, -@c e.g. 5.10.1 +The development of Gnus normally is done on the CVS trunk, i.e. there +are no separate branches to develop and test new features. Most of the +time, the trunk is developed quite actively with more or less daily +changes. Only after a new major release, e.g. 5.10.1, there's usually a +feature period of several months. After the release of Gnus 5.10.6 the +development of new features started again on the trunk while the 5.10 +series is continued on the stable branch (v5-10) from which more stable +releases will be done when needed (5.10.7, @dots{}). +Stable releases of Gnus finally become part of Emacs. E.g. Gnus 5.8 +became a part of Emacs 21 (relabeled to Gnus 5.9). The 5.10 series will +become part of Emacs 22 (as Gnus 5.11). @section Syncing @@ -221,60 +247,63 @@ The CVS trunk is developed quite actively. @c @c -I do Emacs->Gnus less often (than Gnus->Emacs) because it tends to -require more manual work. - -By default I sync about once a week. I also try to follow any Gnus -threads on the mailing lists and make sure any changes being discussed -are kept more up-to-date (so say 1-2 days delay for "topical" changes). - - -@c - -BTW, just to add even more verbose explanation about the syncing thing: - -Basically my idea is that the Emacs-Gnus gateway will cause all common -files in Emacs and Gnus v5-10 to be identical except when there's a very -good reason (e.g., the Gnus version string in Emacs says "5.11", but the -v5-10 version string remains "5.10.whatever"). Furthermore, all changes -in these files in either Emacs or the v5-10 branch will be installed -into the Gnus CVS trunk, again except where there's a good reason -(typically so far the only exception has been that the changes already -exist in the trunk in modified form). Because of this, when the next -Emacs Gnus upgrade comes, it should be very easy -- just plonk in the -files from the Gnus trunk without worrying about lost changes from the -Emacs tree. +In the past, the inclusion of Gnus into Emacs was quite cumbersome. For +each change made to Gnus in Emacs repository, it had to be checked that +it was applied to the new Gnus version, too. Else, bug fixes done in +Emacs repository might have been lost. + +With the inclusion of Gnus 5.10, Miles Bader has set up an Emacs-Gnus +gateway to ensure the bug fixes from Emacs CVS are propagated to Gnus +CVS semi-automatically. These bug fixes are installed on the stable +branch and on the trunk. Basically the idea is that the gateway will +cause all common files in Emacs and Gnus v5-10 to be identical except +when there's a very good reason (e.g., the Gnus version string in Emacs +says @samp{5.11}, but the v5-10 version string remains @samp{5.10.x}). +Furthermore, all changes in these files in either Emacs or the v5-10 +branch will be installed into the Gnus CVS trunk, again except where +there's a good reason. +@c (typically so far the only exception has been that the changes +@c already exist in the trunk in modified form). +Because of this, when the next major version of Gnus will be included in +Emacs, it should be very easy -- just plonk in the files from the Gnus +trunk without worrying about lost changes from the Emacs tree. The effect of this is that as hacker, you should generally only have to make changes in one place: - 1) If it's a file which is thought of as being outside of Gnus (e.g., - the new "encrypt.el"), you should probably make the change in the - Emacs tree, and it will show up in the Gnus tree a few days later. - - If you don't have Emacs CVS access (or it's inconvenient), you can - change such a file in the v5-10 branch, and it should propagate to - Emacs CVS -- however, it will get some extra scrutiny (by me) to see - if the changes are possibly controversial and need discussion on the - mailing list. [Many changes are obvious bug-fixes however, so often - there won't be any problem.] - - 2) If it's to a Gnus file, and it's important enough that it should be - part of Emacs/v5-10, then you can make the change on the v5-10 - branch, and it will go into Emacs CVS and the Gnus CVS trunk (a few - days later). - - If you know that there will be conflicts (perhaps because the - affected source code is different in v5-10 and the Gnus CVS trunk), - then you can install your change in both places, and when I try to - sync them, there will be a conflict -- however, since in most such - cases there would be a conflict _anyway_, it's often easier for me - to resolve it simply if I see two "identical" changes, and can just - choose the proper one, rather than having to actually fix the code. - - 3) For general Gnus development changes, of course you just make the - change on the Gnus CVS trunk and it goes into Emacs a few years - later... :-) +@itemize +@item +If it's a file which is thought of as being outside of Gnus (e.g., the +new @file{encrypt.el}), you should probably make the change in the Emacs +tree, and it will show up in the Gnus tree a few days later. + +If you don't have Emacs CVS access (or it's inconvenient), you can +change such a file in the v5-10 branch, and it should propagate to Emacs +CVS -- however, it will get some extra scrutiny (by Miles) to see if the +changes are possibly controversial and need discussion on the mailing +list. Many changes are obvious bug-fixes however, so often there won't +be any problem. + +@item +If it's to a Gnus file, and it's important enough that it should be part +of Emacs and the v5-10 branch, then you can make the change on the v5-10 +branch, and it will go into Emacs CVS and the Gnus CVS trunk (a few days +later). The most prominent examples for such changes are bug-fixed +including improvements on the documentation. + +If you know that there will be conflicts (perhaps because the affected +source code is different in v5-10 and the Gnus CVS trunk), then you can +install your change in both places, and when I try to sync them, there +will be a conflict -- however, since in most such cases there would be a +conflict @emph{anyway}, it's often easier for me to resolve it simply if +I see two @samp{identical} changes, and can just choose the proper one, +rather than having to actually fix the code. + +@item +For general Gnus development changes, of course you just make the +change on the Gnus CVS trunk and it goes into Emacs a few years +later... :-) +@end itemize Of course in any case, if you just can't wait for me to sync your change, you can commit it in more than one place and probably there will @@ -283,6 +312,17 @@ can be easily resolved automatically (sometimes I notice silly things in such multiple commits, like whitespace differences, and unify those ;-). +@c I do Emacs->Gnus less often (than Gnus->Emacs) because it tends to +@c require more manual work. + +@c By default I sync about once a week. I also try to follow any Gnus +@c threads on the mailing lists and make sure any changes being discussed +@c are kept more up-to-date (so say 1-2 days delay for "topical" changes). + +@c + +@c BTW, just to add even more verbose explanation about the syncing thing: + @section Miscellanea @heading @file{GNUS-NEWS} -- 2.25.1