Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-300

3 files changed, 9 insertions, 3 deletions

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 69351db078b..1c14d412ec3 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-07  Kenichi Handa  <handa@ni.aist.go.jp>
+
+        * quail/lao.el (quail-map-from-table): Allow a tone just after a
+        consonant.
+
 2007-11-17  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (check-declare): New target.
diff --git a/leim/quail/lao.el b/leim/quail/lao.el
index b9a2dd9bf9b..d6e1758b0dc 100644
--- a/leim/quail/lao.el
+++ b/leim/quail/lao.el
@@ -206,8 +206,9 @@ you need to re-load it to properly re-initialize related alists.")
                 lao-tone-key-alist
                 lao-other-key-alist)
     (svt-state (lao-semivowel-key-alist . v-state)
-              (lao-vowel-key-alist . t-state)
-              lao-voweltone-key-alist)
+               (lao-vowel-key-alist . t-state)
+               lao-voweltone-key-alist
+               lao-tone-key-alist)
     (v-state (lao-vowel-key-alist . t-state))
     (t-state lao-tone-key-alist))))
 
diff --git a/leim/quail/latin-post.el b/leim/quail/latin-post.el
index 73c08cee191..9d7b8ee4d71 100644
--- a/leim/quail/latin-post.el
+++ b/leim/quail/latin-post.el
@@ -1256,7 +1256,7 @@ Doubling the postfix separates the letter and postfix: e.g. aee -> ae
 (quail-define-package
  "scandinavian-postfix" "Latin-1" "SC<" t
  "Scandinavian input method with postfix modifiers
-Supported languages are Swidish, Norwegian, Danish, and Finnish.
+Supported languages are Swedish, Norwegian, Danish, and Finnish.
 
 ae -> æ
 oe -> ø