# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1214465199 0
# Node ID f03cdab98409cbf7862c842d9ebd15343b09ceb4
# Parent  3b62d9a85b3fa2bbd231cee2f6596e699ebdb4d4
(terminal-composition-function): Fix previous change.

diff -r 3b62d9a85b3f -r f03cdab98409 lisp/composite.el
--- a/lisp/composite.el	Thu Jun 26 07:25:25 2008 +0000
+++ b/lisp/composite.el	Thu Jun 26 07:26:39 2008 +0000
@@ -452,7 +452,8 @@
 		      (= (aref char-width-table (aref string pos)) 0))
 	    (setq pos (1+ pos)))
 	  (if (and (> from 0)
-		   (terminal-composition-base-character-p (aref string (1- from))))
+		   (terminal-composition-base-character-p
+		    (aref string (1- from))))
 	      (compose-string string (1- from) pos)
 	    (compose-string string from pos
 			    (concat " " (buffer-substring from pos)))))
@@ -460,7 +461,7 @@
 		  (= (aref char-width-table (char-after pos)) 0))
 	(setq pos (1+ pos)))
       (if (and (> from (point-min))
-	       (terminal-composition-base-character-p (char-after pos)))
+	       (terminal-composition-base-character-p (char-after (1- from))))
 	  (compose-region (1- from) pos)
 	(compose-region from pos
 			(concat " " (buffer-substring from pos)))))