[Emacs-diffs] emacs-24 c6400e1: Fix composition of characters from Syriac and Arabis scripts.

[Eli Zaretskii]

branch: emacs-24
commit c6400e17e75391479a1c8d9e3bca5f0fe2b968bb
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix composition of characters from Syriac and Arabis scripts.
    
     lisp/language/misc-lang.el (composition-function-table): Add Syriac
     characters and also ZWJ/ZWNJ.  See
     http://lists.gnu.org/archive/html/help-gnu-emacs/2014-12/msg00248.html
     for the details.
---
 lisp/ChangeLog             |    7 +++++++
 lisp/language/misc-lang.el |    3 ++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 30697ec..2fabe02 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2014-12-27  Eli Zaretskii  <address@hidden>
+
+       * language/misc-lang.el (composition-function-table): Add Syriac
+       characters and also ZWJ/ZWNJ.  See
+       http://lists.gnu.org/archive/html/help-gnu-emacs/2014-12/msg00248.html
+       for the details.
+
 2014-12-27  Fabián Ezequiel Gallina  <address@hidden>
 
        python.el: Fix message when sending region.
diff --git a/lisp/language/misc-lang.el b/lisp/language/misc-lang.el
index ee06e34..b56d31f 100644
--- a/lisp/language/misc-lang.el
+++ b/lisp/language/misc-lang.el
@@ -78,7 +78,8 @@ and Italian.")))
 (set-char-table-range
  composition-function-table
  '(#x600 . #x6FF)
- (list ["[\u0600-\u06FF]+" 0 font-shape-gstring]))
+ (list ["\u200D?[\u0600-\u074F]+[\u200D\u200C]*[\u0600-\u074F]+\u200D?"
+       0 font-shape-gstring]))
 
 (provide 'misc-lang)