Merge from emacs-23

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

diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 0d6ed0028aeeff76e28cbc23ffa67ccece58d626..094e86dbaddc6b943e23c8ea51a60fa888fea904 100644 (file)
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -811,7 +811,7 @@ The format of KBD-LAYOUT is the same as `quail-keyboard-layout'."
                      (setq translation (aref (cdr translation) 0))
                    (setq translation " ")))
              (setq done-list (cons translation done-list)))
-         (setq translation ch))
+         (setq translation (aref kbd-layout i)))
        (aset layout i translation))
       (setq i (1+ i)))