mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-25 07:28:20 +00:00
dd6ab82fb5
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).
|
||
|---|---|---|
| .. | ||
| CXTERM-DIC | ||
| ja-dic | ||
| MISC-DIC | ||
| quail | ||
| SKK-DIC | ||
| .arch-inventory | ||
| .gitignore | ||
| ChangeLog | ||
| ChangeLog.22 | ||
| COPYING | ||
| leim-ext.el | ||
| Makefile.in | ||
| makefile.w32-in | ||
| README | ||
This directory contains LEIM files. LEIM stands for Libraries of Emacs Input Methods. Contents of subdirectories are as follows. CXTERM-DIC: This directory contains source dictionaries (TIT format) for Chinese input method distributed with cxterm (Chinese version xterm). These dictionaries are automatically converted to Quail packages (Emacs Lisp source files) by `make'. MISC-DIC: This directory contains various dictionaries for Chinese input methods. These dictionaries are automatically converted to Quail packages (Emacs Lisp source files) by `make'. quail: This directory contains Emacs Lisp source files for Quail packages. SKK-DIC: This directory contains source dictionary for Japanese input method distributed with SKK (Japanese input method run with Mule). But, you don't need this file because we distribute an Emacs Lisp source file ja-dic/ja-dic.el which has already been converted from the source dictionary (See below). ja-dic: This directory contains Emacs Lisp source file ja-dic.el which is generated from a source dictionary in SKK-DIC directory. In addition, it contains a byte compiled file ja-dic.elc for users convenience because it takes rather long time to byte-compile ja-dic.el.