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

[Juri Linkov]

Index: emacs/lisp/international/quail.el
diff -c emacs/lisp/international/quail.el:1.144 
emacs/lisp/international/quail.el:1.145
*** emacs/lisp/international/quail.el:1.144     Tue Oct 25 06:10:23 2005
--- emacs/lisp/international/quail.el   Fri Oct 28 05:47:31 2005
***************
*** 1598,1610 ****
    (or (and (consp def) (aref (cdr def) (car (car def))))
        def
        (and (> len 1)
!          (let ((str (quail-get-current-str
!                      (1- len)
!                      (quail-map-definition (quail-lookup-key
!                                             quail-current-key (1- len))))))
             (if str
                 (concat (if (stringp str) str (char-to-string str))
!                        (substring quail-current-key (1- len) len)))))))
  
  (defvar quail-guidance-translations-starting-column 20)
  
--- 1598,1618 ----
    (or (and (consp def) (aref (cdr def) (car (car def))))
        def
        (and (> len 1)
!          (let* ((str (quail-get-current-str
!                       (1- len)
!                       (quail-map-definition (quail-lookup-key
!                                              quail-current-key (1- len)))))
!                 (substr1 (substring quail-current-key (1- len) len))
!                 (str1 (and (quail-deterministic)
!                            (quail-get-current-str
!                             1
!                             (quail-map-definition (quail-lookup-key
!                                                    substr1 1))))))
             (if str
                 (concat (if (stringp str) str (char-to-string str))
!                        (if str1
!                            (if (stringp str1) str1 (char-to-string str1))
!                          substr1)))))))
  
  (defvar quail-guidance-translations-starting-column 20)