[Emacs-diffs] master 9df49cd: Unify CNS11643-15 in a way that avoids segfaults

[Eli Zaretskii]

branch: master
commit 9df49cddae382d775122b52f19276963dfc6d670
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Unify CNS11643-15 in a way that avoids segfaults
    
    * lisp/international/mule-conf.el: Redo unification of
    cns11643-15.  (Bug#27964)
    (chinese-cns11643-15): Add the missing :unify-map attribute.
---
 lisp/international/mule-conf.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index 15f7c0f..a7764b6 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -1175,7 +1175,8 @@
   :short-name  "CNS11643-15"
   :long-name "CNS11643-15 (Chinese traditional)"
   :code-space [33 126 33 126]
-  :code-offset #x27A000)
+  :code-offset #x27A000
+  :unify-map "CNS-F")
 
 (unify-charset 'chinese-gb2312)
 (unify-charset 'chinese-gbk)
@@ -1186,8 +1187,7 @@
 (unify-charset 'chinese-cns11643-5)
 (unify-charset 'chinese-cns11643-6)
 (unify-charset 'chinese-cns11643-7)
-;; Doing the below causes Emacs to segfault during Punct.el production.
-;; (unify-charset 'chinese-cns11643-15)
+(unify-charset 'chinese-cns11643-15)
 (unify-charset 'big5)
 (unify-charset 'chinese-big5-1)
 (unify-charset 'chinese-big5-2)