Change "myanmar" to "burmese"

4 files changed, 21 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1eb01818750..9bc11ededa9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-01  Kenichi Handa  <handa@m17n.org>
+
+        * language/burmese.el (burmese-composable-pattern): Renamed from
+        myanmar-composable-pattern.
+
+        * international/characters.el (script-list): Change myanmar to
+        burmese.
+
+        * international/fontset.el (script-representative-chars): Change
+        myanmar to burmese.
+        (otf-script-alist): Likewise.
+        (setup-default-fontset): Likewise.
+
 2010-02-27  Jeremy Whitlock  <jcscoobyrs@gmail.com>  (tiny change)
 
         * progmodes/python.el (python-pdbtrack-stack-entry-regexp): Allow
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index fb7c573ceac..cf43bb1e6ca 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -1124,7 +1124,7 @@ Setup char-width-table appropriate for non-CJK language environment."
          (#x0E00 #x0E5F thai)
          (#x0E80 #x0EDF lao)
          (#x0F00 #x0FFF tibetan)
-         (#x1000 #x109F myanmar)
+         (#x1000 #x109F burmese)
          (#x10A0 #x10FF georgian)
          (#x1100 #x11FF hangul)
          (#x1200 #x139F ethiopic)
@@ -1151,7 +1151,7 @@ Setup char-width-table appropriate for non-CJK language environment."
          (#x3400 #x9FAF han)
          (#xA000 #xA4CF yi)
          (#xAA00 #xAA5F cham)
-         (#xAA60 #xAA7B myanmar)
+         (#xAA60 #xAA7B burmese)
          (#xAA80 #xAADF tai-viet)
          (#xAC00 #xD7AF hangul)
          (#xF900 #xFAFF han)
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 767cff850f6..969f9a96551 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -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))
+              ,(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)
diff --git a/lisp/language/burmese.el b/lisp/language/burmese.el
index 554cd7a482c..a53320b5430 100644
--- a/lisp/language/burmese.el
+++ b/lisp/language/burmese.el
@@ -36,7 +36,7 @@
              (sample-text . "Burmese (မ္ရန္‌မာ) မင္‍ဂလာပာ")
              (documentation . t)))
 
-(defvar myanmar-composable-pattern
+(defvar burmese-composable-pattern
   (let ((table
          '(("K" . "[\u1004\u105A]\u103A\u1039") ; KINZI sequence
            ("C" . "[\u1000-\u102A\u103F\u1041-\u1049\u104E\u105A-\u105D\u1061\u1065-\u1066\u106E\u1071\u1075\u1081\u108E\uAA60-\uAA6F\uAA71-\uAA76]") ; consonant and vowel letter
@@ -52,7 +52,7 @@
                                                regexp t t))))
     regexp))
 
-(let ((elt (list (vector myanmar-composable-pattern 0 'font-shape-gstring)
+(let ((elt (list (vector burmese-composable-pattern 0 'font-shape-gstring)
                  (vector "." 0 'font-shape-gstring))))
   (set-char-table-range composition-function-table '(#x1000 . #x107F) elt)
   (set-char-table-range composition-function-table '(#xAA60 . #xAA7B) elt))