[Emacs-diffs] Changes to emacs/lisp/international/kkc.el

[Kenichi Handa]

Index: emacs/lisp/international/kkc.el
diff -c emacs/lisp/international/kkc.el:1.28 
emacs/lisp/international/kkc.el:1.29
*** emacs/lisp/international/kkc.el:1.28        Tue Feb  4 08:09:38 2003
--- emacs/lisp/international/kkc.el     Fri Jul 18 21:23:50 2003
***************
*** 549,561 ****
          ;; 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)) ?\ )))))
      (if (not msg)
        (let ((len (length kkc-current-conversions))
              (max-width (window-width (minibuffer-window)))
--- 549,555 ----
          ;; 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)))
      (if (not msg)
        (let ((len (length kkc-current-conversions))
              (max-width (window-width (minibuffer-window)))
***************
*** 587,593 ****
          (setq l (nthcdr this-idx kkc-current-conversions))
          (setq msg (format " %c %s"
                            (aref kkc-show-conversion-list-index-chars 0)
!                           (car l))
                idx (1+ this-idx)
                l (cdr l))
          (while (< idx next-idx)
--- 581,588 ----
          (setq l (nthcdr this-idx kkc-current-conversions))
          (setq msg (format " %c %s"
                            (aref kkc-show-conversion-list-index-chars 0)
!                           (propertize (car l)
!                                       'kkc-conversion-index this-idx))
                idx (1+ this-idx)
                l (cdr l))
          (while (< idx next-idx)
***************
*** 595,614 ****
                              msg
                              (aref kkc-show-conversion-list-index-chars
                                    (- idx this-idx))
!                             (car l)))
!           (setq idx (1+ idx)
                  l (cdr l)))
          (aset first-slot 2 msg)))
      (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)))
  
  ;; Update the conversion area with the latest conversion selected.
  ;; ALL if non nil means to update the whole area, else update only
--- 590,615 ----
                              msg
                              (aref kkc-show-conversion-list-index-chars
                                    (- idx this-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)
!       (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