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).

1 files changed, 8 insertions, 7 deletions

diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index b2694bc2b78..e23830bc210 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -42,6 +42,9 @@ EMACSOPT = -batch --no-init-file --no-site-file --multibyte
 # Set EMACSLOADPATH correctly (already defined in environment).
 EMACSLOADPATH=$(lisp)
 
+# Use C locale
+LC_ALL = C
+
 lisptagsfiles1 = $(lisp)/*.el
 lisptagsfiles2 = $(lisp)/*/*.el
 ETAGS = "../lib-src/$(BLD)/etags"
@@ -62,13 +65,7 @@ DONTCOMPILE = \
         $(lisp)/forms-d2.el \
         $(lisp)/forms-pass.el \
         $(lisp)/generic-x.el \
-        $(lisp)/international/latin-1.el \
-        $(lisp)/international/latin-2.el \
-        $(lisp)/international/latin-3.el \
-        $(lisp)/international/latin-4.el \
-        $(lisp)/international/latin-5.el \
-        $(lisp)/international/latin-8.el \
-        $(lisp)/international/latin-9.el \
+        $(lisp)/international/latin1-disp.el \
         $(lisp)/international/mule-conf.el \
         $(lisp)/language/czech.el \
         $(lisp)/language/devanagari.el \
@@ -87,6 +84,10 @@ DONTCOMPILE = \
         $(lisp)/language/thai.el \
         $(lisp)/language/utf-8-lang.el \
         $(lisp)/language/georgian.el \
+        $(lisp)/language/vietnamese.el \
+        $(lisp)/language/cyrillic.el \
+        $(lisp)/language/chinese.el \
+        $(lisp)/language/indian.el \
         $(lisp)/loaddefs.el \
         $(lisp)/ldefs-boot.el \
         $(lisp)/loadup.el \