Fix damage caused by trunk merge in emacs--unicode--0--patch-15
Some files in the emacs--cvs-trunk--0 branch had their arch id-tag changed
from tagline to explicit [because they were used as template files, and their
syntax didn't accommodate stripping comments, so the the generated files
caused id-tag conflicts when an in-tree build was done].
Unfortunately arch doesn't handle id-tag changes well, so this resulted in
the files appearing to be deleted, and then added again. When that changeset
was merged into the unicode branch, it resulted in unicode-specific changes
being dropped, and the trunk version being added.
To fix this, I restored these files to their pre-merge versions (from
emacs--unicode--0--patch-14), and then manually reapplied all changes from:
(1) the unicode branch from the bogus merge point to the current version
(emacs--unicode--0--patch-15 - emacs--unicode--0--patch-34)
(2) the trunk from the bogus merge point to the latest version which was
merged into the unicode branch
(emacs--cvs-trunk--0--patch-218 - emacs--cvs-trunk--0--patch-522)
and fixed any conflicts (mostly due to doubly-applied patch hunks that patch
couldn't detect).
They caused mingw32-make.exe bootstrap to fail with the following error if cmd.exe
was being used as the shell:
"process_begin: CreateProcess((null), echo., ...) failed."
I replaced the "@echo." lines in nt\makefile.w32-in with "@echo ." This writes a .
to the screen but that is far more desirable than make bootstrap failing.
I replaced the "echo. ..." line in lisp\makefile.w32-in with "echo ;;; ...". This
writes an extra comment line to loaddefs.el. Again this is far more desirable than
make bootstrap failing.
NOTE: I am using cmd.exe as my shell when building Emacs with MinGW instead of
the sh.exe that comes with msys because when I use sh.exe as my shell, loaddefs.el
does not get properly generated and I get various auto load errors.
Tweak arch tagging to make build/install-in-place less annoying
Previously, autoconf-created Makefiles and the like would contain
duplicate taglines (unfortunately, autoconf doesn't seem to have a
`strip in generated file' comment mechanism) leading to conflicts, and
installing in place would create unknown directories and copies of
source directories (leading to conflicts with the source directories).
This changeset makes all autoconf-processed files use explicit id-tags
and adds .arch-inventory entries to ignore installation directories.
release version 7.2.
* lisp/mail/mh-alias.el, lisp/mail/mh-comp.el,
lisp/mail/mh-customize.el, lisp/mail/mh-e.el, lisp/mail/mh-funcs.el,
lisp/mail/mh-identity.el, lisp/mail/mh-index.el,
lisp/mail/mh-loaddefs.el, lisp/mail/mh-mime.el, lisp/mail/mh-pick.el,
lisp/mail/mh-seq.el, lisp/mail/mh-speed.el, lisp/mail/mh-utils.el,
lisp/mail/mh-xemacs-compat.el: Moved to mh-e. Note that reply2.pbm and
reply2.xpm, which were created by the MH-E package, were left in mail
since they can probably be used by other mail packages.
* makefile.w32-in (WINS): Added mh-e.
* makefile.nt (WINS): Added mh-e.
using appropriate rule for build environment.
(loaddefs.el-SH, loaddefs.el-CMD): New targets. Include small set
of autoloads and defvars, sufficient to dump bootstrap emacs.
(update-subdirs-SH): Use hard-coded list of top-level lisp
subdirs, because find program on Windows is not compatible with
Unix find.
(compile-CMD, compile-SH): Use `batch-byte-compile-if-not-done'.
Explicitly load loaddefs.el so that bootstrap emacs can compile
properly.
(bootstrap-clean): Add dependency on loaddefs.el, to ensure
minimal stub sufficient for dumping bootstrap emacs is available.
Use `compile-always'.
(bootstrap): Use `compile', not `compile-files'. Use `update-subdirs'.
(compile): Renamed from `compile-files'.
(compile-CMD, compile-SH): Renamed from `compile-files-*'.
(DONTCOMPILE): Add various language files.
(DONTCOMPILE): Remove term/xterm.el.
(finder-inf.el): Remove.
(update-authors): New target.
(TAGS-LISP): Remove $(lispsource).
(compile-always): Renamed from `compile-files'.
(compile): New target, adapted from `compile-files'.
(compile-calc): New target.
(recompile): Change `.' to $(lisp).
(bootstrap): Add update-subdirs and finder-data
to dependencies; change compile-files to compile.
. instead of absolute path for lisp dir, to avoid bug in W2K
cmd.exe's handling of FOR loops.
(autoloads): Set find-file-suppress-same-file-warnings to t to
avoid slew of spurious messages.
