Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

[bpt/emacs.git] / lisp / language / misc-lang.el

diff --git a/lisp/language/misc-lang.el b/lisp/language/misc-lang.el
index 1286b36..ee06e34 100644 (file)
--- a/lisp/language/misc-lang.el
+++ b/lisp/language/misc-lang.el
@@ -67,6 +67,14 @@ and Italian.")))
            (sample-text . "Arabic      السّلام عليكم")
            (documentation . "Bidirectional editing is supported.")))
 
+(set-language-info-alist
+ "Persian" '((charset unicode)
+           (coding-system utf-8 iso-8859-6 windows-1256)
+           (coding-priority utf-8 iso-8859-6 windows-1256)
+           (input-method . "farsi-transliterate-banan")
+           (sample-text . "Persian     فارسی")
+           (documentation . "Bidirectional editing is supported.")))
+
 (set-char-table-range
  composition-function-table
  '(#x600 . #x6FF)