Merged 21.5 tree and mule-ucs

A file named unicode.el in mule-ucs shadows a new file of the same name in the 21.5 tree. (I plan to rename the mule-ucs file, but until this change propagates we need a workaround.) I used the following patch and the environment setting EMACSLOADPATH=`pwd`/lisp:`pwd`/lisp/mule:`pwd`/lisp/term export EMACSLOADPATH to disable the mule-ucs unicode. I believe unicode is dumped, so in practice this conflict shouldn't cause problems (except for mule-ucs users, who will possibly have problems with their init files). The patch may be a good idea anyway, for general namespace cleanliness. Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.287 diff -u -U0 -r1.287 ChangeLog --- ChangeLog 2002/03/13 08:54:02 1.287 +++ ChangeLog 2002/03/13 11:06:47 ＠＠ -0,0 +1,10 ＠＠ +2002-03-13 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * Makefile.in.in (all-elc all-elcs,finder,lisp/finder-inf.el): + Use -no-autoloads to avoid picking up packages. + (all-elc all-elcs): Explicitly load lisp/auto-autoloads.elc. + +2002-03-12 Ben Wing <ben(a)xemacs.org&gt; + + * The Great Mule Merge: placeholder. + Index: Makefile.in.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/Makefile.in.in,v retrieving revision 1.5 diff -u -r1.5 Makefile.in.in --- Makefile.in.in 2001/12/20 06:08:09 1.5 +++ Makefile.in.in 2002/03/13 11:06:53 ＠＠ -281,7 +281,8 ＠＠ ## Build XEmacs and recompile out-of-date and missing .elc files along ## the way. all-elc all-elcs: lib-src lwlib dump-elcs src - ${blddir}/src/${PROGNAME} -batch -vanilla \ + ${blddir}/src/${PROGNAME} -batch -no-autoloads \ + -l lisp/auto-autoloads.el \ -l update-elc-2.el -f batch-update-elc-2 lisp ## Sub-target for all-elc. ＠＠ -291,7 +292,7 ＠＠ finder: src ＠echo "Building finder database ..." ＠(cd ./lisp; \ - ${blddir}/src/${PROGNAME} -batch -vanilla \ + ${blddir}/src/${PROGNAME} -batch -no-autoloads \ -eval '(setq finder-compile-keywords-quiet t)' \ -l finder -f finder-compile-keywords ) ＠echo "Building finder database ...(done)" ＠＠ -299,7 +300,7 ＠＠ lisp/finder-inf.el: ＠echo "Building finder database ..." ＠(cd ./lisp; \ - ${blddir}/src/${PROGNAME} -batch -vanilla \ + ${blddir}/src/${PROGNAME} -batch -no-autoloads \ -eval '(setq finder-compile-keywords-quiet t)' \ -l finder -f finder-compile-keywords ) ＠echo "Building finder database ...(done)" -- Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Don't ask how you can "do" free software business; ask what your business can "do for" free software.