merge trunk

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ffbd385..868667e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-25  Kenichi Handa  <handa@m17n.org>
+
+       * language/misc-lang.el ("Arabic"): New language environment.
+       Setup composition-function-table for Arabic characters.
+
+       * international/fontset.el (setup-default-fontset): Fix typo for
+       arabic OTF spec (fini->fina).
+
 2010-08-24  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
        * whitespace.el: Allow cleaning up blanks without blank