aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorJoakim Verona2015-01-16 22:29:10 +0100
committerJoakim Verona2015-01-16 22:29:10 +0100
commit5e2255017323c54feeaaee220175d7761a3b6ed1 (patch)
tree3f843af60b826b63e12482301ce20745a95ede3e /admin
parentb64675500decba1c707bc5d5c6d57f633934778f (diff)
parent78e6ccc4a5006272b14f352e459a6d3bf52ed07b (diff)
downloademacs-5e2255017323c54feeaaee220175d7761a3b6ed1.tar.gz
emacs-5e2255017323c54feeaaee220175d7761a3b6ed1.zip
merge master
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog5
-rw-r--r--admin/unidata/uvs.el1
2 files changed, 6 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 2b04281f400..70d1714f8eb 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
12015-01-15 Eli Zaretskii <eliz@gnu.org>
2
3 * unidata/uvs.el (uvs-print-table-ivd): Call set-binary-mode on
4 stdout.
5
12015-01-12 Paul Eggert <eggert@cs.ucla.edu> 62015-01-12 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Say "ELC foo.elc" instead of "GEN foo.elc" 8 Say "ELC foo.elc" instead of "GEN foo.elc"
diff --git a/admin/unidata/uvs.el b/admin/unidata/uvs.el
index 8bad523ce35..a6beac97db4 100644
--- a/admin/unidata/uvs.el
+++ b/admin/unidata/uvs.el
@@ -200,6 +200,7 @@ corresponding number."
200 (insert-file-contents filename) 200 (insert-file-contents filename)
201 (uvs-alist-from-ivd collection-id 201 (uvs-alist-from-ivd collection-id
202 sequence-id-to-glyph-func)))) 202 sequence-id-to-glyph-func))))
203 (set-binary-mode 'stdout t)
203 (princ "/* Automatically generated by uvs.el. */\n") 204 (princ "/* Automatically generated by uvs.el. */\n")
204 (princ 205 (princ
205 (format "static const unsigned char mac_uvs_table_%s_bytes[] =\n {\n" 206 (format "static const unsigned char mac_uvs_table_%s_bytes[] =\n {\n"