view admin/ChangeLog.22 @ 89970:a849e5779b8c

Revision: [e-mail]--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).

2004-02-12  Kenichi Handa  <[e-mail]>

	* charsets/.cvsignore: New file.

	* charsets/mapconv: Add code for handling KANJI-DATABASE format.

	* charsets/Makefile (all): Rename target from charsets.  Depend on
	${TRANS_TABLE}
	(CNS-2.map, CNS-3.map, CNS-4.map, CNS-5.map, CNS-6.map)
	(CNS-7.map): Generate from cns2ucsdkw.txt.
	(install): Copy updated files only.

2004-01-30  Kenichi Handa  <[e-mail]>

	* charsets/cp932.awk: Append user defined area of CP932.

2004-01-28  Kenichi Handa  <[e-mail]>

	* charsets/Makefile (JISX2131.map): Convert 0x2015 to 0x2014,
	0x2299 to 0x29BF.

2004-01-27  Kenichi Handa  <[e-mail]>

	* charsets/Makefile (TRANS_TABLE): New macro.
	(JISX0208.map): Convert 0x2015 to 0x2014.
	(cp51932.el): New target. 
	(eucjp-ms.el): New target.
	(install): Include ${TRANS_TABLE}.
	(CJK): Include JISX213A.map.
	(JISX213A.map): New target.

	* charsets/eucjp-ms.awk: New file.

	* charsets/cp51932.awk: New file.

2004-01-26  Kenichi Handa  <[e-mail]>

	* charsets/cp932.awk: New file.

	* charsets/Makefile (CP932-2BYTE.map): Call mapconv with
	cp932.awk.

	* charsets/mapconv: In UNICODE2 case, sort by 4th field after
	running an awk program.

2004-01-25  Kenichi Handa  <[e-mail]>

	* charsets/mapconv: Handle UNICODE2.

	* charsets/Makefile (CJK): Include CP932-2BYTE.map
	(CP932-2BYTE.map): New target.

2003-08-16  Kenichi Handa  <[e-mail]>

	* charsets: New directory for scripts to generate charset map
	files in ../etc/charsets/.

	* charsets/Makefile, charsets/mapconv, charsets/compact.awk,
	charsets/big5.awk charsets/gb18030-2.awk, charsets/gb18030-4.awk,
	cahrsets/kuten.awk: New files.

;; Local Variables:
;; coding: iso-2022-7bit-unix
;; End:

    Copyright (C) 2003 Free Software Foundation, Inc.
  Copying and distribution of this file, with or without modification,
  are permitted provided the copyright notice and this notice are preserved.

;;; arch-tag: 021fa3ae-e1d0-451b-866e-c5b10b325e78