# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1094349227 0
# Node ID a849e5779b8ce8fad0a5110865524c37dcf3ae02
# Parent  3219f94257bc0119375b14c87b8c5796e34f1837
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).

diff -r 3219f94257bc -r a849e5779b8c leim/Makefile.in
--- a/leim/Makefile.in	Sat Sep 04 09:14:28 2004 +0000
+++ b/leim/Makefile.in	Sun Sep 05 01:53:47 2004 +0000
@@ -47,7 +47,7 @@
 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
diff -r 3219f94257bc -r a849e5779b8c lisp/makefile.w32-in
--- a/lisp/makefile.w32-in	Sat Sep 04 09:14:28 2004 +0000
+++ b/lisp/makefile.w32-in	Sun Sep 05 01:53:47 2004 +0000
@@ -42,6 +42,9 @@
 # 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 @@
 	$(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 @@
 	$(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 \
diff -r 3219f94257bc -r a849e5779b8c src/Makefile.in
--- a/src/Makefile.in	Sat Sep 04 09:14:28 2004 +0000
+++ b/src/Makefile.in	Sun Sep 05 01:53:47 2004 +0000
@@ -1111,7 +1111,7 @@
    keyboard.h $(config_h)
 regex.o: regex.c syntax.h buffer.h $(config_h) regex.h category.h character.h \
    charset.h
-region-cache.o: region-cache.c buffer.h region-cache.h
+region-cache.o: region-cache.c buffer.h region-cache.h $(config_h)
 scroll.o: scroll.c termchar.h dispextern.h frame.h msdos.h keyboard.h \
    $(config_h)
 search.o: search.c regex.h commands.h buffer.h region-cache.h syntax.h \
diff -r 3219f94257bc -r a849e5779b8c src/makefile.w32-in
--- a/src/makefile.w32-in	Sat Sep 04 09:14:28 2004 +0000
+++ b/src/makefile.w32-in	Sun Sep 05 01:53:47 2004 +0000
@@ -115,6 +115,8 @@
 	$(BLD)/region-cache.$(O)		\
 	$(BLD)/strftime.$(O)			\
 	$(BLD)/charset.$(O)			\
+	$(BLD)/character.$(O)			\
+	$(BLD)/chartab.$(O)			\
 	$(BLD)/coding.$(O)			\
 	$(BLD)/category.$(O)			\
 	$(BLD)/ccl.$(O)				\
@@ -122,6 +124,7 @@
 	$(BLD)/fringe.$(O)			\
 	$(BLD)/image.$(O)
 
+
 WIN32OBJ = $(BLD)/w32term.$(O)			\
 	   $(BLD)/w32xfns.$(O)			\
 	   $(BLD)/w32fns.$(O)			\
@@ -167,7 +170,7 @@
 temacs:         $(BLD) $(TEMACS)
 $(TEMACS):      $(TLIB0) $(TLIB1) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES)
 	$(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)
-	"../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 16
+	"../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 20
 
 bootstrap: bootstrap-emacs
 
@@ -262,6 +265,7 @@
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/buffer.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/commands.h \
 	$(SRC)/dispextern.h \
@@ -277,6 +281,7 @@
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/composite.h \
 	$(SRC)/dispextern.h \
@@ -359,6 +364,7 @@
 	$(EMACS_ROOT)/nt/inc/sys/file.h \
 	$(SRC)/buffer.h \
 	$(SRC)/ccl.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/coding.h \
 	$(SRC)/commands.h \
@@ -375,6 +381,7 @@
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/buffer.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/commands.h \
 	$(SRC)/composite.h \
@@ -396,6 +403,7 @@
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/buffer.h \
 	$(SRC)/category.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/keymap.h
 
@@ -405,9 +413,22 @@
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/ccl.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/coding.h
 
+$(BLD)/character.$(O) : \
+	$(SRC)/character.c \
+	$(EMACS_ROOT)/src/s/ms-w32.h \
+	$(EMACS_ROOT)/src/m/intel386.h \
+	$(EMACS_ROOT)/src/config.h \
+	$(SRC)/buffer.h \
+	$(SRC)/character.h \
+	$(SRC)/charset.h \
+	$(SRC)/coding.h \
+	$(SRC)/composite.h \
+	$(SRC)/disptab.h
+
 $(BLD)/charset.$(O) : \
 	$(SRC)/charset.c \
 	$(EMACS_ROOT)/src/s/ms-w32.h \
@@ -415,11 +436,20 @@
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/buffer.h \
 	$(SRC)/ccl.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/coding.h \
 	$(SRC)/composite.h \
 	$(SRC)/disptab.h
 
+$(BLD)/chartab.$(O) : \
+	$(SRC)/chartab.c \
+	$(EMACS_ROOT)/src/s/ms-w32.h \
+	$(EMACS_ROOT)/src/m/intel386.h \
+	$(EMACS_ROOT)/src/config.h \
+	$(SRC)/charset.h \
+	$(SRC)/character.h
+
 $(BLD)/cm.$(O) : \
 	$(SRC)/cm.c \
 	$(EMACS_ROOT)/src/s/ms-w32.h \
@@ -434,6 +464,7 @@
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/buffer.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/commands.h \
 	$(SRC)/dispextern.h \
@@ -451,6 +482,7 @@
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/buffer.h \
 	$(SRC)/ccl.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/coding.h \
 	$(SRC)/composite.h \
@@ -466,6 +498,7 @@
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/buffer.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/composite.h \
 	$(SRC)/dispextern.h \
@@ -479,6 +512,7 @@
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/buffer.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/frame.h \
 	$(SRC)/keyboard.h \
@@ -492,6 +526,7 @@
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/buffer.h \
 	$(SRC)/ccl.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/coding.h \
 	$(SRC)/commands.h \
@@ -509,6 +544,7 @@
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/cm.h \
 	$(SRC)/commands.h \
@@ -537,6 +573,7 @@
 	$(EMACS_ROOT)/src/config.h \
 	$(EMACS_ROOT)/nt/inc/sys/file.h \
 	$(SRC)/buffer.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/keyboard.h \
 	$(SRC)/keymap.h
@@ -546,6 +583,7 @@
 	$(EMACS_ROOT)/src/s/ms-w32.h \
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.c
 
 $(BLD)/editfns.$(O) : \
@@ -556,6 +594,7 @@
 	$(EMACS_ROOT)/nt/inc/pwd.h \
 	$(SRC)/buffer.h \
 	$(SRC)/ccl.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/coding.h \
 	$(SRC)/composite.h \
@@ -616,6 +655,7 @@
 	$(EMACS_ROOT)/nt/inc/sys/file.h \
 	$(SRC)/buffer.h \
 	$(SRC)/ccl.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/coding.h \
 	$(SRC)/commands.h \
@@ -637,6 +677,7 @@
 	$(EMACS_ROOT)/src/epaths.h \
 	$(SRC)/buffer.h \
 	$(SRC)/ccl.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/coding.h \
 	$(SRC)/systime.h
@@ -672,6 +713,7 @@
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
 	$(SRC)/ccl.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/coding.h \
 	$(SRC)/commands.h \
@@ -694,6 +736,7 @@
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/buffer.h \
 	$(SRC)/ccl.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/dispextern.h \
 	$(SRC)/fontset.h \
@@ -711,6 +754,7 @@
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/commands.h \
 	$(SRC)/dispextern.h \
@@ -772,6 +816,7 @@
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/buffer.h \
 	$(SRC)/category.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/composite.h \
 	$(SRC)/dispextern.h \
@@ -795,6 +840,7 @@
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/composite.h \
 	$(SRC)/dispextern.h \
@@ -830,6 +876,7 @@
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/commands.h \
 	$(SRC)/composite.h \
@@ -861,6 +908,7 @@
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/commands.h \
 	$(SRC)/composite.h \
@@ -889,6 +937,7 @@
 	$(EMACS_ROOT)/src/epaths.h \
 	$(SRC)/buffer.h \
 	$(SRC)/ccl.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/coding.h \
 	$(SRC)/commands.h \
@@ -920,6 +969,7 @@
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/buffer.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h
 
 $(BLD)/md5.$(O) : \
@@ -932,6 +982,7 @@
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/buffer.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/commands.h \
 	$(SRC)/composite.h \
@@ -999,6 +1050,7 @@
 	$(SRC)/s/ms-w32.h \
 	$(SRC)/m/intel386.h \
 	$(SRC)/ccl.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/coding.h \
 	$(SRC)/config.h \
@@ -1016,6 +1068,7 @@
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/buffer.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/composite.h \
 	$(SRC)/dispextern.h \
@@ -1039,6 +1092,7 @@
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
 	$(SRC)/ccl.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/coding.h \
 	$(SRC)/commands.h \
@@ -1078,6 +1132,7 @@
 	$(SRC)/m/intel386.h \
 	$(SRC)/buffer.h \
 	$(SRC)/category.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/config.h \
 	$(SRC)/regex.h \
@@ -1113,6 +1168,7 @@
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
 	$(SRC)/category.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/commands.h \
 	$(SRC)/composite.h \
@@ -1145,6 +1201,7 @@
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/buffer.h \
 	$(SRC)/category.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/commands.h \
 	$(SRC)/composite.h \
@@ -1189,6 +1246,7 @@
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/ccl.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/cm.h \
 	$(SRC)/coding.h \
@@ -1285,6 +1343,7 @@
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
 	$(SRC)/ccl.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/coding.h \
 	$(SRC)/commands.h \
@@ -1316,6 +1375,7 @@
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/composite.h \
 	$(SRC)/dispextern.h \
@@ -1338,6 +1398,7 @@
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
 	$(SRC)/ccl.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/coding.h \
 	$(SRC)/composite.h \
@@ -1363,6 +1424,7 @@
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/coding.h \
 	$(SRC)/dispextern.h \
@@ -1385,6 +1447,7 @@
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
 	$(SRC)/ccl.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/coding.h \
 	$(SRC)/composite.h \
@@ -1416,6 +1479,7 @@
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
 	$(SRC)/ccl.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/coding.h \
 	$(SRC)/composite.h \
@@ -1446,6 +1510,7 @@
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/fontset.h \
 	$(SRC)/frame.h \
@@ -1462,6 +1527,7 @@
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
+	$(SRC)/character.h \
 	$(SRC)/charset.h \
 	$(SRC)/dispextern.h \
 	$(SRC)/fontset.h \