From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 28 Dec 2014 17:00:14 +0000 (-0800)
Subject: Fix produce_composite_width typo
X-Git-Tag: emacs-25.0.90~2631^2~12^2~10
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=20791069fa34b486c018ba7f27982bdc6ad2a4ea;p=emacs.git

Fix produce_composite_width typo

* term.c (produce_composite_glyph):
Fix typo that confused number of columns for pixel width.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 9e3fb904b93..2ab5101fc6f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix produce_composite_width typo
+	* term.c (produce_composite_glyph):
+	Fix typo that confused number of columns for pixel width.
+
 2014-12-28  Paul Eggert  <eggert@Penguin.CS.UCLA.EDU>
 
 	Wrap dll functions more simply
diff --git a/src/term.c b/src/term.c
index 04f6e3318a0..bcb83e5891d 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1736,7 +1736,7 @@ produce_composite_glyph (struct it *it)
     {
       struct composition *cmp = composition_table[it->cmp_it.id];
 
-      it->pixel_width = cmp->width;
+      it->pixel_width = cmp->pixel_width;
     }
   else
     {