From: Kenichi Handa <handa@m17n.org>
Date: Thu, 26 Jun 2008 07:26:39 +0000 (+0000)
Subject: (terminal-composition-function): Fix previous change.
X-Git-Tag: emacs-pretest-23.0.90~4469
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a509862bf359ebe4a30e92016980c0f7634c3456;p=emacs.git

(terminal-composition-function): Fix previous change.
---

diff --git a/lisp/composite.el b/lisp/composite.el
index 0d4912be747..ce920deaa02 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -452,7 +452,8 @@ character.  All non-spacing characters has this function in
 		      (= (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 @@ character.  All non-spacing characters has this function in
 		  (= (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)))))