* cl-generic.el (cl-defmethod): Make docstring dynamic

[gnu-emacs] / lisp / language / misc-lang.el

diff --git a/lisp/language/misc-lang.el b/lisp/language/misc-lang.el
index e2e4f29dd9e4a3b3a5f85abbd9a379abe0738f75..c03fd429fe9f14b124fb6b945c161c6f892b5ad9 100644 (file)
--- a/lisp/language/misc-lang.el
+++ b/lisp/language/misc-lang.el
@@ -1,7 +1,7 @@
-;;; misc-lang.el --- support for miscellaneous languages (characters) -*- no-byte-compile: t -*-
+;;; misc-lang.el --- support for miscellaneous languages (characters)
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010
+;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
@@ -67,12 +67,21 @@ 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)
- (list ["[\u0600-\u06FF]+" 0 font-shape-gstring]))
+ '(#x600 . #x74F)
+ (list (vector "[\u0600-\u074F\u200C\u200D]+" 0 'font-shape-gstring)
+       (vector "[\u200C\u200D][\u0600-\u074F\u200C\u200D]+"
+               1 'font-shape-gstring)))
 
 (provide 'misc-lang)
 
-;; arch-tag: 6953585c-1a1a-4c09-be82-a2518afb6074
 ;;; misc-lang.el ends here