* lisp/international/mule-cmds.el (read-char-by-name): Move let-binding of

[gnu-emacs] / lisp / international / fontset.el

diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 767cff850f687bb6d6a23950f44a922121dd3d0e..7e893a3d75156df0276b308aa3cf9708f8b2aa27 100644 (file)
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -1,9 +1,8 @@
 ;;; fontset.el --- commands for handling fontset
 
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1997-2012  Free Software Foundation, Inc.
 ;; 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
 ;; Copyright (C) 2003, 2006
@@ -59,6 +58,7 @@
        ("jisx0208" . japanese-jisx0208)
        ("jisx0201" . jisx0201)
        ("jisx0212" . japanese-jisx0212)
+       ("ksx1001" . korean-ksc5601)
        ("ksc5601.1987" . korean-ksc5601)
        ("cns11643.1992.*1" . chinese-cns11643-1)
        ("cns11643.1992.*2" . chinese-cns11643-2)
@@ -169,7 +169,7 @@
        (thai #xE17)
        (lao #xEA5)
        (tibetan #xF40)
-       (myanmar #x1000)
+       (burmese #x1000)
        (georgian #x10D3)
        (ethiopic #x1208)
        (cherokee #x13B6)
@@ -260,7 +260,7 @@
        (math . mathematical)
        (mong . mongolian)
        (musc . musical-symbol)
-       (mymr . myanmar)
+       (mymr . burmese)
        (nko\  . nko)
        (ogam . ogham)
        (ital . old_italic)
@@ -415,8 +415,8 @@
      (sinhala ,(font-spec :registry "iso10646-1" :otf '(sinh nil (akhn))))
      (malayalam ,(font-spec :registry "iso10646-1" :otf '(mlym nil (akhn))))
 
-     (myanmar ,(font-spec :registry "iso10646-1" :otf '(mymr))
-             ,(font-spec :registry "iso10646-1" :script 'myanmar))
+     (burmese ,(font-spec :registry "iso10646-1" :otf '(mymr nil nil))
+             ,(font-spec :registry "iso10646-1" :script 'burmese))
 
      (lao ,(font-spec :registry "iso10646-1" :otf '(lao\  nil nil (mark)))
          ,(font-spec :registry "iso10646-1" :script 'lao)
@@ -433,7 +433,7 @@
               (nil . "koi8-r"))
 
      (arabic ,(font-spec :registry "iso10646-1"
-                        :otf '(arab nil (init medi fini liga)))
+                        :otf '(arab nil (init medi fina liga)))
             (nil . "MuleArabic-0")
             (nil . "MuleArabic-1")
             (nil . "MuleArabic-2")
@@ -700,8 +700,8 @@ Internal use only.  Should be called at startup time."
 ;; "HP-Hebrew8"                                    [36]
 ;;         HPHEBREW8 8-bit character set
 ;; "HP-Japanese15"                                 [36]
-;;         HPJAPAN15 15-bit characer set,
-;;         modified from industry defacto
+;;         HPJAPAN15 15-bit character set,
+;;         modified from industry de facto
 ;;         standard Shift-JIS
 ;; "HP-Kana8"                                      [36]
 ;;         HPKANA8 8-bit character set
@@ -859,9 +859,9 @@ Internal use only.  Should be called at startup time."
 (defun x-decompose-font-name (pattern)
   "Decompose PATTERN into XLFD fields and return a vector of the fields.
 The length of the vector is 12.
-The FOUNDRY and FAMILY fields are concatinated and stored in the first
+The FOUNDRY and FAMILY fields are concatenated and stored in the first
 element of the vector.
-The REGISTRY and ENCODING fields are concatinated and stored in the last
+The REGISTRY and ENCODING fields are concatenated and stored in the last
 element of the vector.
 
 Return nil if PATTERN doesn't conform to XLFD."
@@ -1152,5 +1152,4 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
 ;;
 (provide 'fontset)
 
-;; arch-tag: bb53e629-0234-403c-950e-551e61554849
 ;;; fontset.el ends here