summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2014-05-26 08:48:28 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2014-05-26 08:48:28 -0700
commitcf2f54c4e3d8adb26e3f4b8e9e51364165877444 (patch)
treebad8d1922f69f243af3cfcbab39da993a59b3f0a /src
parent1501bf82b601858f9e270b3aacb4d850ec01e372 (diff)
downloademacs-cf2f54c4e3d8adb26e3f4b8e9e51364165877444.tar.gz
Include sources used to create macuvs.h.
* admin/unidata/IVD_Sequences.txt: New file. * admin/unidata/Makefile.in (${top_srcdir}/src/macuvs.h): New rule. (all): Build it. (extraclean): Remove it. * admin/unidata/README: Mention BidiMirroring.txt and IVD_Sequences.txt. * admin/unidata/copyright.html: Update to current version from Unicode Consortium. * admin/unidata/uvs.el: Rename from admin/mac/uvs.el. (uvs-print-table-ivd): Output a header in the form that unidata-gen.el generates. * lisp/international/README: Refer to the Unicode Terms of Use rather than copying it bodily here, as that simplifies maintenance. * src/Makefile.in ($(srcdir)/macuvs.h): New rule. * src/macuvs.h: Use automatically-generated header.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/Makefile.in3
-rw-r--r--src/macuvs.h9
3 files changed, 9 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index dc3002b9a97..4e68b1b8452 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-26 Paul Eggert <eggert@cs.ucla.edu>
+
+ Include sources used to create macuvs.h.
+ * Makefile.in ($(srcdir)/macuvs.h): New rule.
+ * macuvs.h: Use automatically-generated header.
+
2014-05-25 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (move_it_in_display_line_to): Don't record wrap position
diff --git a/src/Makefile.in b/src/Makefile.in
index 388923596c9..70e31b50946 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -418,7 +418,8 @@ all: emacs$(EXEEXT) $(OTHER_FILES)
$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
cd ../leim && $(MAKE) $(MFLAGS) leim-list.el EMACS="$(bootstrap_exe)"
-$(lispsource)/international/charprop.el: bootstrap-emacs$(EXEEXT)
+$(srcdir)/macuvs.h $(lispsource)/international/charprop.el: \
+ bootstrap-emacs$(EXEEXT)
cd ../admin/unidata && $(MAKE) $(MFLAGS) all EMACS="../$(bootstrap_exe)"
## The dumped Emacs is as functional and more efficient than
diff --git a/src/macuvs.h b/src/macuvs.h
index 20879888f9a..2f52ce3da8e 100644
--- a/src/macuvs.h
+++ b/src/macuvs.h
@@ -1,11 +1,4 @@
-/* UVS (Unicode Variation Sequence) table definitions.
-
-This file is part of GNU Emacs. */
-
-/* This was generated from the Ideographic Variation Database file at
- http://www.unicode.org/ivd/data/2012-03-02/IVD_Sequences.txt
- using admin/mac/uvs.el in GNU Emacs, and distributed under
- the Terms of Use in http://www.unicode.org/terms_of_use.html. */
+/* Automatically generated by uvs.el. */
static const unsigned char mac_uvs_table_adobe_japan1_bytes[] =
{
0x00, 0x0e, 0x00, 0x01, 0x1f, 0x9e, 0x00, 0x00,