# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1271922833 0
# Node ID a0e9f0a5c5a14540e47f58eb74d3abadee1460ea
# Parent  7361123c71e371cebc7204dc8e36d8b634f36a04# Parent  8cdb3c0534d0e40ebe80702893d025f87d950849
Merge from mainline.

diff -r 7361123c71e3 -r a0e9f0a5c5a1 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Apr 21 22:57:48 2010 +0000
+++ b/lisp/ChangeLog	Thu Apr 22 07:53:53 2010 +0000
@@ -1,3 +1,8 @@
+2010-04-22  Kenichi Handa  <handa@m17n.org>
+
+	* language/indian.el (gurmukhi-composable-pattern): Fix typo.
+	(gujarati-composable-pattern): Fix typo.
+
 2010-04-20  Kenichi Handa  <handa@m17n.org>
 
 	* language/indian.el (oriya-composable-pattern)
diff -r 7361123c71e3 -r a0e9f0a5c5a1 lisp/language/indian.el
--- a/lisp/language/indian.el	Wed Apr 21 22:57:48 2010 +0000
+++ b/lisp/language/indian.el	Thu Apr 22 07:53:53 2010 +0000
@@ -198,15 +198,14 @@
 
 (defconst gurmukhi-composable-pattern
   (let ((table
-	 '(("a" . "[\u0A01-\u0A02]")	; SIGN ADAK BINDI .. BINDI
-	   ("A" . "\u0A03]")		; SIGN VISARGA
+	 '(("a" . "[\u0A01-\u0A02\u0A70]") ; SIGN ADAK BINDI .. BINDI, TIPPI
+	   ("A" . "\u0A03")		; SIGN VISARGA
 	   ("V" . "[\u0A05-\u0A14]")	; independent vowel
 	   ("C" . "[\u0A15-\u0A39\u0A59-\u0A5E]")	; consonant
-	   ("Y" . "[\u0A2F\u0A30\u0A35\u0A39]") ; YA, RA, VA, HA
+	   ("Y" . "[\u0A2F-u0A30\u0A35\u0A39]") ; YA, RA, VA, HA
 	   ("n" . "\u0A3C")		; NUKTA
 	   ("v" . "[\u0A3E-\u0A4C]")	; vowel sign
 	   ("H" . "\u0A4D")		; VIRAMA
-	   ("a" . "\u0A70")		; TIPPI
 	   ("N" . "\u200C")		; ZWNJ
 	   ("J" . "\u200D")		; ZWJ
 	   ("X" . "[\u0A00-\u0A7F]"))))	; all coverage
@@ -226,7 +225,7 @@
 (defconst gujarati-composable-pattern
   (let ((table
 	 '(("a" . "[\u0A81-\u0A82]")	; SIGN CANDRABINDU .. ANUSVARA
-	   ("A" . "\u0A83]")		; SIGN VISARGA
+	   ("A" . "\u0A83")		; SIGN VISARGA
 	   ("V" . "[\u0A85-\u0A94\u0AE0-\u0AE1]") ; independent vowel
 	   ("C" . "[\u0A95-\u0AB9]")	; consonant
 	   ("R" . "\u0AB0")		; RA