2 files changed, 9 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 30697ec1a2a..2fabe02333e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2014-12-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * 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  <fgallina@gnu.org>
 
         python.el: Fix message when sending region.
diff --git a/lisp/language/misc-lang.el b/lisp/language/misc-lang.el
index ee06e34eef4..b56d31f6e16 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)