Merge from emacs--rel--22

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

diff --git a/lisp/international/kkc.el b/lisp/international/kkc.el
index bfd8a079834792faaf519cb1ec5d44a8e011ca17..d671d2900c2d9a81b81efbc56c03e70d5be44d40 100644 (file)
--- a/lisp/international/kkc.el
+++ b/lisp/international/kkc.el
@@ -1,7 +1,11 @@
 ;;; kkc.el --- Kana Kanji converter    -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
+;; 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
 
 ;; Keywords: mule, multilingual, Japanese
 
@@ -19,8 +23,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -61,7 +65,8 @@ This string is shown at mode line when users are in KKC mode.")
   "Save initial setup code for KKC to a file specified by `kkc-init-file-name'"
   (if (and kkc-init-file-flag
           (not (eq kkc-init-file-flag t)))
-      (let ((coding-system-for-write 'iso-2022-7bit))
+      (let ((coding-system-for-write 'iso-2022-7bit)
+           (print-length nil))
        (write-region (format "(setq kkc-lookup-cache '%S)\n" kkc-lookup-cache)
                      nil
                      kkc-init-file-name))))
@@ -167,7 +172,7 @@ area while indicating the current selection by `<N>'."
 ;; kkc-current-conversions for key sequence kkc-current-key of length
 ;; LEN.  If no conversion is found in the dictionary, don't change
 ;; kkc-current-conversions and return nil.
-;; Postfixes are handled only if POSTFIX is non-nil. 
+;; Postfixes are handled only if POSTFIX is non-nil.
 (defun kkc-lookup-key (len &optional postfix prefer-noun)
   ;; At first, prepare cache data if any.
   (unless kkc-init-file-flag
@@ -288,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))))
 
@@ -548,13 +553,7 @@ and change the current conversion to the last one in the group."
          ;; The currently selected conversion is after the list shown
          ;; previously.  We start calculation of message width from
          ;; the conversion next of TO.
-         (setq this-idx next-idx msg nil)
-       ;; The current conversion is in MSG.  Just clear brackets
-       ;; around index number.
-       (if (string-match "<.>" msg)
-           (progn
-             (aset msg (match-beginning 0) ?\ )
-             (aset msg (1- (match-end 0)) ?\ )))))
+         (setq this-idx next-idx msg nil)))
     (if (not msg)
        (let ((len (length kkc-current-conversions))
              (max-width (window-width (minibuffer-window)))
@@ -586,7 +585,8 @@ and change the current conversion to the last one in the group."
          (setq l (nthcdr this-idx kkc-current-conversions))
          (setq msg (format " %c %s"
                            (aref kkc-show-conversion-list-index-chars 0)
-                           (car l))
+                           (propertize (car l)
+                                       'kkc-conversion-index this-idx))
                idx (1+ this-idx)
                l (cdr l))
          (while (< idx next-idx)
@@ -594,20 +594,26 @@ and change the current conversion to the last one in the group."
                              msg
                              (aref kkc-show-conversion-list-index-chars
                                    (- idx this-idx))
-                             (car l)))
-           (setq idx (1+ idx)
+                             (propertize (car l)
+                                         'kkc-conversion-index idx))
+                 idx (1+ idx)
                  l (cdr l)))
          (aset first-slot 2 msg)))
+
+    ;; Highlight the current conversion.
     (if (> current-idx 0)
-       (progn
-         ;; Highlight the current conversion by brackets.
-         (string-match (format " \\(%c\\) "
-                               (aref kkc-show-conversion-list-index-chars
-                                     (- current-idx this-idx)))
-                       msg)
-         (aset msg (match-beginning 0) ?<)
-         (aset msg (1- (match-end 0)) ?>)))
-    (message "%s" msg)))
+       (let ((pos 3)
+             (limit (length msg)))
+         (remove-text-properties 0 (length msg) '(face nil) msg)
+         (while (not (eq (get-text-property pos 'kkc-conversion-index msg)
+                         current-idx))
+           (setq pos (next-single-property-change pos 'kkc-conversion-index
+                                                  msg limit)))
+         (put-text-property pos (next-single-property-change
+                                 pos 'kkc-conversion-index msg limit)
+                            'face 'highlight msg)))
+    (let ((message-log-max nil))
+      (message "%s" msg))))
 
 ;; Update the conversion area with the latest conversion selected.
 ;; ALL if non nil means to update the whole area, else update only
@@ -654,4 +660,5 @@ and change the current conversion to the last one in the group."
 ;;
 (provide 'kkc)
 
-;; kkc.el ends here
+;;; arch-tag: 3cbfd56e-74e6-4f60-bb46-ba7c2d366fbf
+;;; kkc.el ends here