diff options
| author | Miles Bader <miles@gnu.org> | 2004-09-05 01:53:47 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2004-09-05 01:53:47 +0000 |
| commit | 1f7ee70e8a621580580e3920cecf7de36aeeda1b (patch) | |
| tree | 72f4481d14ec1f631add6f413a449c78784ecfa1 /leim/Makefile.in | |
| parent | 76b309006aea2a3f63a873234440b565fcb331a8 (diff) | |
| download | emacs-1f7ee70e8a621580580e3920cecf7de36aeeda1b.tar.gz | |
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-35
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).
Diffstat (limited to 'leim/Makefile.in')
| -rw-r--r-- | leim/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/leim/Makefile.in b/leim/Makefile.in index acffcc7f7b5..6cf9143583f 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -47,7 +47,7 @@ BUILT-EMACS = ${dot}${dot}/src/emacs buildlisppath=${srcdir}/${dot}${dot}/lisp # How to run Emacs. -RUN-EMACS = EMACSLOADPATH=$(buildlisppath) \ +RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \ ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte # Subdirectories to be made if ${srcdir} is different from the current |