SUPERSEDES APPROVE COMMIT 21.5 Vin: Not applicable to 21.4. robert> Recent changes to the man directory cause compilation robert> errors for GNU makeinfo 4.5. The following fixes the robert> compilation. No Index is yet generated, however. Perhaps robert> a better fix would be to have removed the Index node. Thanks for the patch, Robert! Unfortunately, the main patch didn't apply, apparently due to random whitespace changes somewhere along the way. Also, the ChangeLog patch didn't apply due to changed context because of an intervening commit to the manuals. For ChangeLogs, use either cut and paste, or cvs diff -U 0. I'm superseding with this patch: Index: man/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v retrieving revision 1.284 diff -u -U0 -r1.284 ChangeLog --- man/ChangeLog 31 Jan 2005 20:08:47 -0000 1.284 +++ man/ChangeLog 3 Feb 2005 06:11:24 -0000 ＠＠ -0,0 +1,26 ＠＠ +2005-02-03 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * beta.texi: Update Copyright. Add pointer comment. + + (New packages): Remove personal names, point at jobs.html + instead. + + (Syncing with GNU Emacs): Change "don't assume Mule" to + "conditionalize Mule dependencies correctly". RMS stroking: use + "GNU", not "FSF", in sync notices. + +2005-02-02 Robert Delius Royar <xemacs(a)frinabulax.org&gt; + + * beta.texi (Top): + Add reference to Index in catalog to prevent + errors compiling with GNU makeinfo 4.5. + + * beta.texi (Syncing with GNU Emacs): + Add forward reference to Index in next node to prevent + errors compiling with GNU makeinfo 4.5. + + * beta.texi (Index): + Add backward reference to Syncing with GNU Emacs to + replace obsolete reference to Defining Variables to + prevent errors compiling with GNU makeinfo 4.5. + * xemacs/help.texi (Misc Help): Index: man/beta.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/beta.texi,v retrieving revision 1.1 diff -u -r1.1 beta.texi --- man/beta.texi 31 Jan 2005 20:08:47 -0000 1.1 +++ man/beta.texi 3 Feb 2005 06:11:31 -0000 ＠＠ -1,5 +1,10 ＠＠ \input texinfo ＠c -*-texinfo-*- +＠c This file is in Texinfo format. +＠c If for some reason you do not have the formatted version available, +＠c this file is more or less readable as plain text. +＠c Skip to the line beginning "＠node Introduction". + ＠c %**start of header ＠setfilename ../info/beta.info ＠settitle Info on beta versions of XEmacs ＠＠ -14,6 +19,7 ＠＠ This file describes info relevant to beta versions of XEmacs. Copyright ＠copyright{} 2005 Ben Wing. +Copyright ＠copyright{} 2005 Free Software Foundation, Inc. This file is part of XEmacs. ＠＠ -80,6 +86,7 ＠＠ * Compiling Beta XEmacs:: * Packages:: * Improving XEmacs:: +* Index:: ＠detailmenu --- The Detailed Node Listing --- ＠＠ -691,7 +698,7 ＠＠ $ make install ＠end example -＠node Improving XEmacs, , Packages, Top +＠node Improving XEmacs, Index, Packages, Top ＠chapter Improving XEmacs ＠menu ＠＠ -878,12 +885,12 ＠＠ rapid acceptance of the package. For help in creating new packages, see the (rather sparse) discussions -in the XEmacs User's Guide and the Lisp Reference Manual. The XEmacs -Package Release Engineer (Ville Skyttä ＠uref{mailto:scop＠＠xemacs.org} -is currently serving with Norbert Koch ＠uref{mailto:viteno＠＠xemacs.org} -assisting; Steve Youngs ＠uref{mailto:youngs＠＠xemacs.org} and Stephen -Turnbull ＠uref{mailto:stephen＠＠xemacs.org} also can help) are the most -likely sources of advice. +in the XEmacs User's Guide and the Lisp Reference Manual. The +participants in the XEmacs Beta mailing list +＠uref{mailto:xemacs-beta＠＠xemacs.org} and the XEmacs Package Release +Engineer are the most likely sources of advice. See +＠uref{http://www.xemacs.org/Develop/jobs.html#package,jobs.html} for +current information about package release engineers. ＠node Syncing with GNU Emacs, , New packages, Large contributions ＠subsection Syncing with GNU Emacs ＠＠ -897,7 +904,9 ＠＠ ＠itemize ＠bullet ＠item Recent GNU Emacsen cannot be built without Mule, but XEmacs can. -Make sure your changes do not assume the presence of Mule. +Make sure that changes that depend on the presence of Mule are +appropriately conditionalized, with ＠samp{#ifdef MULE} in C code and +with ＠samp{(featurep 'mule)} in Lisp. ＠item GNU Emacs nomenclature often differs from that of XEmacs. ＠＠ -913,13 +922,16 ＠＠ purpose, we use comments of the form ＠example -/* Synched up with: FSF 21.3 by Stephen Turnbull */ +/* Synched up with: GNU 21.3 by Stephen Turnbull */ ＠end example in the source file itself, as the last element of the prefatory material (copyright notice and commentary). Obviously the comment marker needs to be changed to leading semicolons for Lisp, but -otherwise the format is the same. +otherwise the format is the same. (Older sync comments may have ``FSF'' +in place of ``GNU''. They're equally accurate in our opinion, but +Richard Stallman and other GNU developers consider the term ``FSF +Emacs'' ``insulting''. Please use ``GNU'' in new sync comments.) Of course you should note syncing as the purpose in the ChangeLog, too. But entries get buried deep in the ChangeLog file, and may even ＠＠ -938,7 +950,7 ＠＠ ＠contents ＠c That's all -＠node Index, , Defining Variables, Top +＠node Index, , Improving XEmacs, Top ＠unnumbered Index ＠printindex cp -- Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Ask not how you can "do" free software business; ask what your business can "do for" free software.