Merge from emacs--rel--22

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

diff --git a/lisp/international/kkc.el b/lisp/international/kkc.el
index dc313c7d30ada578c07b556ed9f7c0a7fe5068cb..d671d2900c2d9a81b81efbc56c03e70d5be44d40 100644 (file)
--- a/lisp/international/kkc.el
+++ b/lisp/international/kkc.el
@@ -1,7 +1,9 @@
 ;;; kkc.el --- Kana Kanji converter    -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1997, 1998  Free Software Foundation, Inc.
-;; Copyright (C) 1995, 1997, 1998, 2000, 2001, 2003
+;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
@@ -291,7 +293,7 @@ and the return value is the length of the conversion."
              ;; KEYSEQ is not defined in KKC keymap.
              ;; Let's put the event back.
              (setq unread-input-method-events
-                   (append (string-to-list keyseq)
+                   (append (string-to-list (this-single-command-raw-keys))
                            unread-input-method-events))
              (kkc-terminate))))