From: Kenichi Handa <handa@m17n.org>
Date: Mon, 16 Oct 2006 07:53:52 +0000 (+0000)
Subject: (get_composition_id): Pay attention to TAB
X-Git-Tag: emacs-pretest-23.0.90~8295^2~732
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=69df789ac5431a4f074640bebb513dcac7a67f6c;p=emacs.git

(get_composition_id): Pay attention to TAB
component.
---

diff --git a/src/composite.c b/src/composite.c
index b688c4bbde1..ea6b3708f12 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -366,7 +366,7 @@ get_composition_id (charpos, bytepos, nchars, prop, string)
       float leftmost = 0.0, rightmost;
 
       ch = XINT (key_contents[0]);
-      rightmost = CHAR_WIDTH (ch);
+      rightmost = ch != '\t' ? CHAR_WIDTH (ch) : 1;
 
       for (i = 1; i < glyph_len; i += 2)
 	{
@@ -376,7 +376,7 @@ get_composition_id (charpos, bytepos, nchars, prop, string)
 
 	  rule = XINT (key_contents[i]);
 	  ch = XINT (key_contents[i + 1]);
-	  this_width = CHAR_WIDTH (ch);
+	  this_width = ch != '\t' ? CHAR_WIDTH (ch) : 1;
 
 	  /* A composition rule is specified by an integer value
 	     that encodes global and new reference points (GREF and