diff lisp/international/quail.el @ 89483:2f877ed80fa6

*** empty log message ***
author Kenichi Handa <handa@m17n.org>
date Mon, 08 Sep 2003 12:53:41 +0000
parents 375f2633d815 f657319ddd9b
children 68c22ea6027c
line wrap: on
line diff
--- a/lisp/international/quail.el	Mon Sep 08 11:56:09 2003 +0000
+++ b/lisp/international/quail.el	Mon Sep 08 12:53:41 2003 +0000
@@ -1269,28 +1269,16 @@
 
 (defun quail-input-string-to-events (str)
   "Convert input string STR to a list of events.
-Do so while interleaving with the following special events:
-\(compose-last-chars LEN COMPONENTS)
-\(quail-advice INPUT-STRING)"
-  (let* ((events (mapcar
-		  (lambda (c)
-		    ;; This gives us the chance to unify on input
-		    ;; (e.g. using ucs-tables.el).
-		    (or (and translation-table-for-input
-			     (aref translation-table-for-input c))
-			c))
-		  str))
-	 (len (length str))
-	 (idx len)
-	 composition from to)
-    (while (and (> idx 0)
-		(setq composition (find-composition idx 0 str t)))
-      (setq from (car composition) to (nth 1 composition))
-      (setcdr (nthcdr (1- to) events)
-	      (cons (list 'compose-last-chars (- to from)
-			  (and (not (nth 3 composition)) (nth 2 composition)))
-		    (nthcdr to events)))
-      (setq idx (1- from)))
+If STR has `advice' text property, append the following special event:
+\(quail-advice STR)"
+  (let ((events (mapcar
+		 (lambda (c)
+		   ;; This gives us the chance to unify on input
+		   ;; (e.g. using ucs-tables.el).
+		   (or (and translation-table-for-input
+			    (aref translation-table-for-input c))
+		       c))
+		 str)))
     (if (or (get-text-property 0 'advice str)
 	    (next-single-property-change 0 'advice str))
 	(setq events
@@ -2469,7 +2457,7 @@
 	  (when (> num 0)
 	    (insert "
 KEY SEQUENCE
------------
+------------
 ")
 	    (if (quail-show-layout)
 		(insert "You can also input more characters")
@@ -2797,8 +2785,8 @@
 
     ;; At last, write out LEIM list file.
     (with-current-buffer list-buf
-      (setq buffer-file-coding-system 'iso-2022-7bit)
-      (save-buffer 0))
+      (let ((coding-system-for-write 'iso-2022-7bit))
+	(save-buffer 0)))
     (kill-buffer list-buf)
     (message "Updating %s ... done" leim-list)))