Use standard Unicode names for Thai, Lao

* lisp/language/lao-util.el, lisp/language/thai-util.el:
Don’t override standard Unicode character name (Bug#23698).

1 files changed, 95 insertions, 96 deletions

diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el
index 6103860a84a..a42904f5de4 100644
--- a/lisp/language/lao-util.el
+++ b/lisp/language/lao-util.el
@@ -38,100 +38,100 @@
 (define-category ?v "Lao upper/lower vowel" lao-category-table)
 (define-category ?t "Lao tone" lao-category-table)
 
-(let ((l '((?ກ consonant "LETTER KOR  KAI'" "CHICKEN")
-	   (?ຂ consonant "LETTER KHOR KHAI'" "EGG")
-	   (?຃ invalid nil)
-	   (?ຄ consonant "LETTER QHOR QHWARGN" "BUFFALO")
-	   (?຅ invalid nil)
-	   (?  invalid nil)
-	   (?ງ consonant "LETTER NGOR NGUU" "SNAKE")
-	   (?ຈ consonant "LETTER JOR JUA" "BUDDHIST NOVICE")
-	   (?ຉ invalid nil)
-	   (?ຊ consonant "LETTER XOR X\"ARNG" "ELEPHANT")
-	   (?຋ invalid nil)
-	   (?ຌ invalid nil)
-	   (?ຍ consonant "LETTER YOR YUNG" "MOSQUITO")
-	   (?ຎ invalid nil)
-	   (?ຎ invalid nil)
-	   (?ຎ invalid nil)
-	   (?ຎ invalid nil)
-	   (?ຎ invalid nil)
-	   (?ຎ invalid nil)
-	   (?ດ consonant "LETTER DOR DANG" "NOSE")
-	   (?ຕ consonant "LETTER TOR TAR" "EYE")
-	   (?ຖ consonant "LETTER THOR THUNG" "TO ASK,QUESTION")
-	   (?ທ consonant "LETTER DHOR DHARM" "FLAG")
-	   (?ຘ invalid nil)
-	   (?ນ consonant "LETTER NOR NOK" "BIRD")
-	   (?ບ consonant "LETTER BOR BED" "FISHHOOK")
-	   (?ປ consonant "LETTER POR PAR" "FISH")
-	   (?ຜ consonant "LETTER HPOR HPER\"" "BEE")
-	   (?ຝ consonant "LETTER FHOR FHAR" "WALL")
-	   (?ພ consonant "LETTER PHOR PHUU" "MOUNTAIN")
-	   (?ຟ consonant "LETTER FOR FAI" "FIRE")
-	   (?ຠ invalid nil)
-	   (?ມ consonant "LETTER MOR MAR\"" "HORSE")
-	   (?ຢ consonant "LETTER GNOR GNAR" "MEDICINE")
-	   (?ຣ consonant "LETTER ROR ROD" "CAR")
-	   (?຤ invalid nil)
-	   (?ລ consonant "LETTER LOR LIING" "MONKEY")
-	   (?຦ invalid nil)
-	   (?ວ consonant "LETTER WOR WII" "HAND FAN")
-	   (?ຨ invalid nil)
-	   (?ຩ invalid nil)
-	   (?ສ consonant "LETTER SOR SEA" "TIGER")
-	   (?ຫ consonant "LETTER HHOR HHAI" "JAR")
-	   (?ຬ invalid nil)
-	   (?ອ consonant "LETTER OR OOW" "TAKE")
-	   (?ຮ consonant "LETTER HOR HEA" "BOAT")
-	   (?ຯ special "ELLIPSIS")
-	   (?ະ vowel-base "VOWEL SIGN SARA A")
-	   (?ັ vowel-upper "VOWEL SIGN MAI KAN")
-	   (?າ vowel-base "VOWEL SIGN SARA AR")
-	   (?ຳ vowel-base "VOWEL SIGN SARA AM")
-	   (?ິ vowel-upper "VOWEL SIGN SARA I")
-	   (?ີ vowel-upper "VOWEL SIGN SARA II")
-	   (?ຶ vowel-upper "VOWEL SIGN SARA EU")
-	   (?ື vowel-upper "VOWEL SIGN SARA UR")
-	   (?ຸ vowel-lower "VOWEL SIGN SARA U")
-	   (?ູ vowel-lower "VOWEL SIGN SARA UU")
-	   (?຺ invalid nil)
-	   (?ົ vowel-upper "VOWEL SIGN MAI KONG")
-	   (?ຼ semivowel-lower "SEMIVOWEL SIGN LO")
-	   (?ຽ vowel-base "SEMIVOWEL SIGN SARA IA")
-	   (?຾ invalid nil)
-	   (?຿ invalid nil)
-	   (?ເ vowel-base "VOWEL SIGN SARA EE")
-	   (?ແ vowel-base "VOWEL SIGN SARA AA")
-	   (?ໂ vowel-base "VOWEL SIGN SARA OO")
-	   (?ໃ vowel-base "VOWEL SIGN SARA EI MAI MUAN\"")
-	   (?ໄ vowel-base "VOWEL SIGN SARA AI MAI MAY")
-	   (?໅ invalid nil)
-	   (?ໆ special "KO LA (REPETITION)")
-	   (?໇ invalid nil)
-	   (?່ tone "TONE MAI EK")
-	   (?້ tone "TONE MAI THO")
-	   (?໊ tone "TONE MAI TI")
-	   (?໋ tone "TONE MAI JADTAWAR")
-	   (?໌ tone "CANCELLATION MARK")
-	   (?ໍ vowel-upper "VOWEL SIGN SARA OR")
-	   (?໎ invalid nil)
-	   (?໏ invalid nil)
-	   (?໐ special "DIGIT ZERO")
-	   (?໑ special "DIGIT ONE")
-	   (?໒ special "DIGIT TWO")
-	   (?໓ special "DIGIT THREE")
-	   (?໔ special "DIGIT FOUR")
-	   (?໕ special "DIGIT FIVE")
-	   (?໖ special "DIGIT SIX")
-	   (?໗ special "DIGIT SEVEN")
-	   (?໘ special "DIGIT EIGHT")
-	   (?໙ special "DIGIT NINE")
-	   (?໚ invalid nil)
-	   (?໛ invalid nil)
-	   (?ໜ consonant "LETTER NHOR NHUU" "MOUSE")
-	   (?ໝ consonant "LETTER MHOR MHAR" "DOG")
-	   (?ໞ invalid nil)))
+(let ((l '((?ກ consonant "CHICKEN")
+	   (?ຂ consonant "EGG")
+	   (?຃ invalid)
+	   (?ຄ consonant "BUFFALO")
+	   (?຅ invalid)
+	   (?  invalid)
+	   (?ງ consonant "SNAKE")
+	   (?ຈ consonant "BUDDHIST NOVICE")
+	   (?ຉ invalid)
+	   (?ຊ consonant "ELEPHANT")
+	   (?຋ invalid)
+	   (?ຌ invalid)
+	   (?ຍ consonant "MOSQUITO")
+	   (?ຎ invalid)
+	   (?ຎ invalid)
+	   (?ຎ invalid)
+	   (?ຎ invalid)
+	   (?ຎ invalid)
+	   (?ຎ invalid)
+	   (?ດ consonant "NOSE")
+	   (?ຕ consonant "EYE")
+	   (?ຖ consonant "TO ASK,QUESTION")
+	   (?ທ consonant "FLAG")
+	   (?ຘ invalid)
+	   (?ນ consonant "BIRD")
+	   (?ບ consonant "FISHHOOK")
+	   (?ປ consonant "FISH")
+	   (?ຜ consonant "BEE")
+	   (?ຝ consonant "WALL")
+	   (?ພ consonant "MOUNTAIN")
+	   (?ຟ consonant "FIRE")
+	   (?ຠ invalid)
+	   (?ມ consonant "HORSE")
+	   (?ຢ consonant "MEDICINE")
+	   (?ຣ consonant "CAR")
+	   (?຤ invalid)
+	   (?ລ consonant "MONKEY")
+	   (?຦ invalid)
+	   (?ວ consonant "HAND FAN")
+	   (?ຨ invalid)
+	   (?ຩ invalid)
+	   (?ສ consonant "TIGER")
+	   (?ຫ consonant "JAR")
+	   (?ຬ invalid)
+	   (?ອ consonant "TAKE")
+	   (?ຮ consonant "BOAT")
+	   (?ຯ special)
+	   (?ະ vowel-base)
+	   (?ັ vowel-upper)
+	   (?າ vowel-base)
+	   (?ຳ vowel-base)
+	   (?ິ vowel-upper)
+	   (?ີ vowel-upper)
+	   (?ຶ vowel-upper)
+	   (?ື vowel-upper)
+	   (?ຸ vowel-lower)
+	   (?ູ vowel-lower)
+	   (?຺ invalid)
+	   (?ົ vowel-upper)
+	   (?ຼ semivowel-lower)
+	   (?ຽ vowel-base)
+	   (?຾ invalid)
+	   (?຿ invalid)
+	   (?ເ vowel-base)
+	   (?ແ vowel-base)
+	   (?ໂ vowel-base)
+	   (?ໃ vowel-base)
+	   (?ໄ vowel-base)
+	   (?໅ invalid)
+	   (?ໆ special)
+	   (?໇ invalid)
+	   (?່ tone)
+	   (?້ tone)
+	   (?໊ tone)
+	   (?໋ tone)
+	   (?໌ tone)
+	   (?ໍ vowel-upper)
+	   (?໎ invalid)
+	   (?໏ invalid)
+	   (?໐ special)
+	   (?໑ special)
+	   (?໒ special)
+	   (?໓ special)
+	   (?໔ special)
+	   (?໕ special)
+	   (?໖ special)
+	   (?໗ special)
+	   (?໘ special)
+	   (?໙ special)
+	   (?໚ invalid)
+	   (?໛ invalid)
+	   (?ໜ consonant "MOUSE")
+	   (?ໝ consonant "DOG")
+	   (?ໞ invalid)))
       elm)
   (while l
     (setq elm (car l) l (cdr l))
@@ -146,8 +146,7 @@
 	    ((eq ptype 'tone)
 	     (modify-category-entry char ?t lao-category-table)))
       (put-char-code-property char 'phonetic-type ptype)
-      (put-char-code-property char 'name (nth 2 elm))
-      (put-char-code-property char 'meaning (nth 3 elm)))))
+      (put-char-code-property char 'meaning (nth 2 elm)))))
 
 ;; The general composing rules are as follows:
 ;;